diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
index 97c7367a..88228f52 100644
--- a/Containers/apache/Dockerfile
+++ b/Containers/apache/Dockerfile
@@ -90,7 +90,7 @@ USER www-data:www-data
 STOPSIGNAL SIGTERM
 
 ENTRYPOINT ["/start.sh"]
-CMD ["dinit", "--system", "--container", "apache", "caddy"]
+CMD ["dinit", "--system", "--container", "--socket-path", "/tmp/dinitctl", "apache", "caddy"]
 
 ENV AIO_LOG_LEVEL=warn
 
diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile
index a01b5db8..73ed37da 100644
--- a/Containers/clamav/Dockerfile
+++ b/Containers/clamav/Dockerfile
@@ -40,7 +40,7 @@ RUN set -ex; \
     freshclam --foreground --stdout
 VOLUME /var/lib/clamav
 ENTRYPOINT ["/start.sh"]
-CMD ["dinit", "--system", "--container", "freshclam", "clamd", "milter"]
+CMD ["dinit", "--system", "--container", "--socket-path", "/tmp/dinitctl", "freshclam", "clamd", "milter"]
 LABEL com.centurylinklabs.watchtower.enable="false" \
     wud.watch="false" \
     dockhand.update="false" \
diff --git a/Containers/clamav/start.sh b/Containers/clamav/start.sh
index 2fb2a5b3..01cb3171 100644
--- a/Containers/clamav/start.sh
+++ b/Containers/clamav/start.sh
@@ -4,8 +4,6 @@ if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
 	set -x
 fi
 
-mkdir -p /run/clamav
-
 # Print out clamav version for compliance reasons
 clamscan --version
 
diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile
index e7d6c8fe..25ac0ca5 100644
--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -77,7 +77,7 @@ RUN set -ex; \
 
 USER eturnal:eturnal
 ENTRYPOINT ["/start.sh"]
-CMD ["dinit", "--system", "--container", "nats-server", "eturnal", "janus", "signaling"]
+CMD ["dinit", "--system", "--container", "--socket-path", "/tmp/dinitctl", "nats-server", "eturnal", "janus", "signaling"]
 
 HEALTHCHECK CMD ["/healthcheck.sh"]
 LABEL com.centurylinklabs.watchtower.enable="false" \