diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9db54c89..132699da 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12 AS builder
+FROM alpine AS builder
 
 # Check required arguments exist. These will be provided by the Github Action
 # Workflow and are required to ensure the correct branches are being used.
@@ -67,7 +67,7 @@ RUN make install
 ##### SPS END #####
 
 # Shairport Sync Runtime System
-FROM crazymax/alpine-s6:3.12-edge
+FROM crazymax/alpine-s6:edge
 
 RUN apk -U add \
         alsa-lib \
diff --git a/docker/etc/services.d/01-dbus-daemon/run b/docker/etc/services.d/01-dbus/run
similarity index 100%
rename from docker/etc/services.d/01-dbus-daemon/run
rename to docker/etc/services.d/01-dbus/run