diff --git a/swarm-proxy-letsencrypt/Dockerfile b/swarm-proxy-letsencrypt/Dockerfile
index c54af1938619ad321d889d9f12c4a64bd287561c..88576d8875ed82d7302f88153f92d6c3126cdb9d 100644
--- a/swarm-proxy-letsencrypt/Dockerfile
+++ b/swarm-proxy-letsencrypt/Dockerfile
@@ -52,6 +52,7 @@ RUN rm -f /docker-run.d/nginx-run.sh && \
     mkdir -p /etc/nginx/dhparam && \
     mkdir -p /etc/nginx/conf.d && \
     mkdir -p /etc/nginx/vhost.d && \
+    mkdir -p /etc/nginx/loc.d && \
     mkdir -p /usr/share/nginx/html/.well-known/acme-challenge/
 
 VOLUME ["/etc/nginx/certs", "/etc/nginx/dhparam", "/etc/nginx/conf.d", "/etc/nginx/vhost.d", "/usr/share/nginx/html"]
diff --git a/swarm-proxy-letsencrypt/app/letsencrypt_service b/swarm-proxy-letsencrypt/app/letsencrypt_service
index f3fbc869b59b4982f1d914895fceed6f0e31fe80..ec4768014466bd880229fd8a9532ab55c2690d81 100755
--- a/swarm-proxy-letsencrypt/app/letsencrypt_service
+++ b/swarm-proxy-letsencrypt/app/letsencrypt_service
@@ -347,6 +347,10 @@ server {
   include /etc/nginx/vhost.d/default*;
 
   location / {
+    include /etc/nginx/loc.d/${LE_HOST}-https-*;
+    include /etc/nginx/loc.d/${LE_HOST}-all-*;
+    include /etc/nginx/loc.d/default*;
+
     proxy_pass http://${LE_HOST}_upstream;
   }
 }
diff --git a/swarm-proxy/Dockerfile b/swarm-proxy/Dockerfile
index 9c1b813a4902e18dba5b1afea39d7ab8ab203bd3..ef644bc32e1a60600dda5aaafc30d81b1b517392 100644
--- a/swarm-proxy/Dockerfile
+++ b/swarm-proxy/Dockerfile
@@ -18,6 +18,13 @@ COPY swarm-proxy.conf.tmpl /etc/swarm-gen/templates/
 COPY https-routing.conf.tmpl /etc/swarm-gen/templates/
 COPY 01-copy-default-entry.sh /docker-entrypoint.d/
 
+
+RUN mkdir -p /etc/nginx/certs && \
+    mkdir -p /etc/nginx/dhparam && \
+    mkdir -p /etc/nginx/conf.d && \
+    mkdir -p /etc/nginx/vhost.d && \
+    mkdir -p /etc/nginx/loc.d
+
 VOLUME ["/etc/nginx/certs", "/etc/nginx/dhparam", "/etc/nginx/conf.d", "/etc/nginx/vhost.d", "/etc/nginx/serv.d", "/usr/share/nginx/html"]
 
 ENV DOCKER_HOST unix:///var/run/docker.sock
diff --git a/swarm-proxy/swarm-proxy.conf.tmpl b/swarm-proxy/swarm-proxy.conf.tmpl
index 0d057ec4c36d2860be5a33cf1b0b869813d9e9aa..cbf11e1c4c6732505af0ec5bb81931da63ca9d40 100644
--- a/swarm-proxy/swarm-proxy.conf.tmpl
+++ b/swarm-proxy/swarm-proxy.conf.tmpl
@@ -11,6 +11,9 @@ server {
   include /etc/nginx/vhost.d/default*;
 
   location / {
+    include /etc/nginx/loc.d/${LE_HOST}-http-*;
+    include /etc/nginx/loc.d/${LE_HOST}-all-*;
+    include /etc/nginx/loc.d/default*;
     proxy_pass http://${HOST}_upstream;
   }
 }