diff --git a/nginx.tmpl b/nginx.tmpl
index 42599f7..2f686a3 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -12,6 +12,21 @@ map $http_upgrade $proxy_connection {
   ''      '';
 }
 
+gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+access_log /proc/self/fd/1;
+error_log /proc/self/fd/2;
+
+# HTTP 1.1 support
+proxy_http_version 1.1;
+proxy_buffering off;
+proxy_set_header Host $http_host;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $proxy_connection;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+
 server {
 	listen 80 default_server;
 	server_name _; # This is just an invalid value which will never trigger on a real hostname.
@@ -22,31 +37,27 @@ server {
 
 {{ range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" "," }}
 upstream {{ $host }} {
-
-{{ range $index, $value := $containers }}
-
-	{{ $addrLen := len $value.Addresses }}
+{{ range $container := $containers }}
+	{{ $addrLen := len $container.Addresses }}
 	{{/* If only 1 port exposed, use that */}}
 	{{ if eq $addrLen 1 }}
-		{{ with $address := index $value.Addresses 0 }}
-		   # {{$value.Name}}
+		{{ with $address := index $container.Addresses 0 }}
+		   # {{$container.Name}}
 		   server {{ $address.IP }}:{{ $address.Port }};
 		{{ end }}
-
 	{{/* If more than one port exposed, use the one matching VIRTUAL_PORT env var */}}
-	{{ else if $value.Env.VIRTUAL_PORT }}
-		{{ range $i, $address := $value.Addresses }}
-		   {{ if eq $address.Port $value.Env.VIRTUAL_PORT }}
-		   # {{$value.Name}}
+	{{ else if $container.Env.VIRTUAL_PORT }}
+		{{ range $address := .Addresses }}
+		   {{ if eq $address.Port $container.Env.VIRTUAL_PORT }}
+		   # {{$container.Name}}
 		   server {{ $address.IP }}:{{ $address.Port }};
 		   {{ end }}
 		{{ end }}
-
 	{{/* Else default to standard web port 80 */}}
 	{{ else }}
-		{{ range $i, $address := $value.Addresses }}
+		{{ range $address := $container.Addresses }}
 			{{ if eq $address.Port "80" }}
-			# {{$value.Name}}
+			# {{$container.Name}}
 			server {{ $address.IP }}:{{ $address.Port }};
 			{{ end }}
 		{{ end }}
@@ -55,24 +66,10 @@ upstream {{ $host }} {
 }
 
 server {
-	gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-
 	server_name {{ $host }};
-	proxy_buffering off;
-	error_log /proc/self/fd/2;
-	access_log /proc/self/fd/1;
 
 	location / {
 		proxy_pass http://{{ $host }};
-		proxy_set_header Host $http_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-Proto $proxy_x_forwarded_proto;
-
-		# HTTP 1.1 support
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection $proxy_connection;
 	}
 }
 {{ end }}