diff --git a/templates/vhost.j2 b/templates/vhost.j2
index 494988a..c805cc4 100644
--- a/templates/vhost.j2
+++ b/templates/vhost.j2
@@ -3,7 +3,9 @@
 {% set vhost_listen = vhost.listen|default({}) %}
 
 server {
+	{% if vhost.servername|default([])|length > 0 %}
 	server_name {{ vhost.servername|join(' ') }};
+	{% endif %}
 
 	{% if vhost_listen.ssl|default(True) %}
 	listen {{ vhost_listen.ssl_port|default(443) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %};
@@ -22,6 +24,9 @@ server {
 		proxy_set_header  Host $host;
 		proxy_set_header  X-Real-IP        $remote_addr;
 		proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
+		proxy_set_header  X-Forwarded-Protocol $scheme;
+		proxy_set_header  X-Forwarded-Ssl $https;
+		proxy_set_header  X-Url-Scheme $scheme;
 
 		# hide downstream headers for security reasons
 		proxy_hide_header X-Powered-By;