diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/dependencies.d/init-mod-universal-docker-setup b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/dependencies.d/init-mod-universal-docker-setup
new file mode 100644
index 00000000..e69de29b
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down
new file mode 100644
index 00000000..eb13c838
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish
new file mode 100755
index 00000000..5d767362
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+sed -i '/\/app\/auto-proxy.sh/d' /config/crontabs/root
+rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run
new file mode 100755
index 00000000..2ca9911a
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run
@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+if [ ! -S /var/run/docker.sock ] && [ -z "$DOCKER_HOST" ]; then
+    echo "**** Docker mod not set up properly, skipping SWAG auto-proxy ****"
+    exit 0
+fi
+
+rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf
+sed -i 's|#include /etc/nginx/http.d|include /etc/nginx/http.d|' /config/nginx/nginx.conf
+cp /defaults/auto-proxy-readme /etc/nginx/http.d/auto-proxy-readme
+rm -rf /auto-proxy
+mkdir /auto-proxy
+
+if ! grep -q "/app/auto-proxy.sh" /config/crontabs/root; then
+    echo "*       *       *       *       *       /app/auto-proxy.sh" >> /config/crontabs/root
+    cp /config/crontabs/root /etc/crontabs/root
+fi
+
+/app/auto-proxy.sh
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type
new file mode 100644
index 00000000..3d92b15f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up
new file mode 100644
index 00000000..a4f12586
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-auto-proxy-setup b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-auto-proxy-setup
new file mode 100644
index 00000000..e69de29b
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-auto-proxy-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-auto-proxy-setup
new file mode 100644
index 00000000..e69de29b