diff --git a/.dockerignore b/.dockerignore
index 9bb4e8d66..a4f914edd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,7 @@
 /storage/*.key
 /storage/logs
 /vendor
+/.git
 _ide_helper.php
 .env
 .env.backup
diff --git a/Dockerfile b/Dockerfile
index 455c36839..07da7922b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/scr
 
 # Copy package configs
 COPY docker/deploy/cron/scheduler /etc/cron.d/scheduler
-COPY docker/deploy/etc/services.d/ /etc/services.d/
+COPY --chmod=755 docker/deploy/etc/s6-overlay/ /etc/s6-overlay//
 
 # Copy app
 COPY . /var/www/html
diff --git a/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/run b/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/run
new file mode 100644
index 000000000..4a7b16bd2
--- /dev/null
+++ b/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/run
@@ -0,0 +1,2 @@
+#!/command/execlineb -P
+s6-setuidgid webuser php /var/www/html/artisan queue:work --tries=3 --no-ansi -q
diff --git a/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/type b/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/type
new file mode 100644
index 000000000..1780f9f44
--- /dev/null
+++ b/docker/deploy/etc/s6-overlay/s6-rc.d/queue-worker/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/docker/deploy/etc/s6-overlay/s6-rc.d/user/contents.d/queue-worker b/docker/deploy/etc/s6-overlay/s6-rc.d/user/contents.d/queue-worker
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker/deploy/etc/services.d/queue-worker/run b/docker/deploy/etc/services.d/queue-worker/run
deleted file mode 100644
index 11b3b943a..000000000
--- a/docker/deploy/etc/services.d/queue-worker/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Switch to web user
-su webuser
-
-# Bring up PHP queue worker
-exec php /var/www/html/artisan queue:work --tries=3 --no-ansi -q