diff --git a/webserver/templates/locations/proxy.conf b/webserver/templates/locations/proxy.conf
index ee3566df97acaf688cc3f7e5e4782a979ca58125..37f9de8aef27788cc7ab9dd00bcd10bce4e0310c 100644
--- a/webserver/templates/locations/proxy.conf
+++ b/webserver/templates/locations/proxy.conf
@@ -10,7 +10,7 @@
         proxy_set_header X-Remote-Groups $sso_groups;
         {% endif %}
         {% if location.proxy_host is defined %}
-        proxy_pass https://{{location.proxy_host}}{% if not location.proxy_relative|default(false) %}/{% endif %};
+        proxy_pass {{location.proxy_scheme|default("https")}}://{{location.proxy_host}}{% if not location.proxy_relative|default(false) %}/{% endif %};
         {% elif location.proxy_port is defined %}
         proxy_pass http://127.0.0.1:{{location.proxy_port}}{% if not location.proxy_relative|default(false) %}/{% endif %};
         {% elif server.port is defined %}
@@ -20,7 +20,7 @@
         {% else %}
         proxy_pass http://unix:{{server.socket|default('/run/nginx/' ~ server.server_name ~ '.sock')}}{% if not location.proxy_relative|default(false) %}:/{% endif %};
         {% endif %}
-        proxy_set_header Host {{server.server_name}};
+        proxy_set_header Host {{location.proxy_set_host|default(server.server_name)}};
         {% if server.forward_http|default(true) %}
         proxy_set_header X-Forwarded-Proto https;
         {% else %}