diff --git a/share/templates/conf/nginx/files/default.conf.jinja2 b/share/templates/conf/nginx/files/default.conf.jinja2
index f844651..036c949 100644
--- a/share/templates/conf/nginx/files/default.conf.jinja2
+++ b/share/templates/conf/nginx/files/default.conf.jinja2
@@ -1,3 +1,11 @@
+upstream app_server_{{extended_name}} {
+
+    # for UNIX domain socket setups
+    server unix:/tmp/gunicorn.{{ extended_name }}.sock fail_timeout=0;
+    
+    # server http://{{django_host}}:{{django_port}} fail_timeout=0;
+}
+
 server {
     listen       {{port}};
     server_name  .{{server_name}}
@@ -29,7 +37,8 @@ server {
       proxy_set_header X-Scheme $scheme;
       proxy_connect_timeout 10;
       proxy_read_timeout 10;
-      proxy_pass http://{{django_host}}:{{django_port}}/;
+      # proxy_pass http://{{django_host}}:{{django_port}}/;
+      proxy_pass http://app_server_{{extended_name}};
     }
 
     error_page   500 502 503 504  /50x.html;
diff --git a/share/templates/conf/nginx/files/ssl_socket.jinja2 b/share/templates/conf/nginx/files/ssl_socket.jinja2
index 3195c7b..e55b32e 100644
--- a/share/templates/conf/nginx/files/ssl_socket.jinja2
+++ b/share/templates/conf/nginx/files/ssl_socket.jinja2
@@ -51,26 +51,22 @@ server {
         root   html;
     }
 
+    listen [::]:443 ssl ipv6only=on; # managed by Certbot
     listen 443 ssl; # managed by Certbot
     ssl_certificate /etc/letsencrypt/live/{{server_name}}/fullchain.pem; # managed by Certbot
     ssl_certificate_key /etc/letsencrypt/live/{{server_name}}/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
 }
 
-
 server {
     if ($host = {{server_name}}) {
         return 301 https://$host$request_uri;
     } # managed by Certbot
 
-
     listen {{port}};
-    server_name  .{{server_name}}
+    listen [::]:{{port}};
 
-    charset 	utf-8;
+    server_name {{server_name}};
     return 404; # managed by Certbot
-
-
 }