diff --git a/docker/Dockerfile b/docker/Dockerfile
index c44ff267..84ba6dcf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -121,8 +121,11 @@ RUN addgroup -g 29 docker_audio && addgroup shairport-sync docker_audio && addgr
 # Remove anything we don't need.
 RUN rm -rf /lib/apk/db/*
 
+# Remove any statically-defined Avahi services, e.g. SSH and SFTP
+RUN rm -rf /etc/avahi/services/*.service
+
 # Add run script that will start SPS
 COPY ./docker/run.sh ./run.sh
 RUN chmod +x /run.sh
 
-Entrypoint ["/init","./run.sh"]
+ENTRYPOINT ["/init","./run.sh"]
diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile
index d41cac4f..283442bd 100644
--- a/docker/classic/Dockerfile
+++ b/docker/classic/Dockerfile
@@ -97,8 +97,11 @@ RUN addgroup -g 29 docker_audio && addgroup shairport-sync docker_audio && addgr
 # Remove anything we don't need.
 RUN rm -rf /lib/apk/db/*
 
+# Remove any statically-defined Avahi services, e.g. SSH and SFTP
+RUN rm -rf /etc/avahi/services/*.service
+
 # Add run script that will start SPS
 COPY ./docker/run.sh ./run.sh
 RUN chmod +x /run.sh
 
-Entrypoint ["/init","./run.sh"]
+ENTRYPOINT ["/init","./run.sh"]