diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3ce13cb0..1dc34141 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -68,6 +68,9 @@ WORKDIR /
 # Shairport Sync Runtime System
 FROM crazymax/alpine-s6:3.17-3.1.1.2
 
+ENV S6_CMD_WAIT_FOR_SERVICES=1
+ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
+
 RUN apk -U add \
         alsa-lib \
         avahi \
diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile
index 960822f3..9f5c0fe6 100644
--- a/docker/classic/Dockerfile
+++ b/docker/classic/Dockerfile
@@ -52,6 +52,9 @@ WORKDIR /
 # Shairport Sync Runtime System
 FROM crazymax/alpine-s6:3.17-3.1.1.2
 
+ENV S6_CMD_WAIT_FOR_SERVICES=1
+ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
+
 RUN apk -U add \
         alsa-lib \
         avahi \
diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies
index 97763270..f04b211f 100644
--- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies
+++ b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies
@@ -1 +1 @@
-03-avahi
+01-startup