diff --git a/tools/docker-compose/nginx.conf b/tools/docker-compose/nginx.conf
index 4f1f4e986e..9c9b7510e1 100644
--- a/tools/docker-compose/nginx.conf
+++ b/tools/docker-compose/nginx.conf
@@ -25,12 +25,6 @@ http {
 
     sendfile        on;
     #tcp_nopush     on;
-
-    ssl_session_cache shared:SSL:10m;
-    ssl_session_timeout 10m;
-
-    keepalive_timeout  65;
-
     #gzip  on;
 
     include /etc/nginx/conf.d/*.conf;
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 2325057378..bda25f75d2 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -7,17 +7,32 @@ upstream daphne {
 }
 
 server {
-	listen 8013 default_server;
+       listen 8013 default_server;
+       listen [::]:8013 default_server;
+       return 301 https://$host:8043$request_uri;
+}
+
+server {
 	listen 8043 default_server ssl;
 
 	# If you have a domain name, this is where to add it
     server_name _;
-	keepalive_timeout 70;
+	keepalive_timeout 60;
 
 	ssl_certificate /etc/nginx/nginx.crt;
 	ssl_certificate_key /etc/nginx/nginx.key;
-	ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-	ssl_ciphers HIGH:!aNULL:!MD5;
+
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+
+    # intermediate configuration. tweak to your needs.
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+    ssl_prefer_server_ciphers on;
+
+    # HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
+    add_header Strict-Transport-Security max-age=15768000;
 
     location /static/ {
         root /tower_devel;
@@ -49,7 +64,9 @@ server {
 	}      
 
 	location / {
+                uwsgi_read_timeout 30s;
+                uwsgi_send_timeout 30s;
+                uwsgi_pass uwsgi;
 		include /etc/nginx/uwsgi_params;
-		uwsgi_pass uwsgi;
 	}
 }