diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
index e8f7f1b2..7821fded 100644
--- a/Containers/apache/Dockerfile
+++ b/Containers/apache/Dockerfile
@@ -20,7 +20,9 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://caddyserver.com/api/download?os=linux&arch=amd64" -O "/usr/bin/caddy" \
+ENV DEB_HOST_ARCH="$(dpkg-architecture --query DEB_HOST_ARCH)"
+
+RUN wget "https://caddyserver.com/api/download?os=linux&arch=$DEB_HOST_ARCH" -O "/usr/bin/caddy" \
     && chmod +x /usr/bin/caddy \
     && /usr/bin/caddy version
 
diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile
index 021d298b..7a4d98e2 100644
--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -22,7 +22,9 @@ RUN apt-get update; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl "https://caddyserver.com/api/download?os=linux&arch=amd64" -o "/usr/bin/caddy" \
+ENV DEB_HOST_ARCH="$(dpkg-architecture --query DEB_HOST_ARCH)"
+
+RUN curl "https://caddyserver.com/api/download?os=linux&arch=$DEB_HOST_ARCH" -o "/usr/bin/caddy" \
     && chmod +x /usr/bin/caddy \
     && /usr/bin/caddy version
 
@@ -67,8 +69,7 @@ RUN rm /etc/apache2/ports.conf; \
 
 RUN a2dissite 000-default && \
     a2dissite default-ssl && \
-    a2ensite mastercontainer.conf && \
-    service apache2 restart
+    a2ensite mastercontainer.conf
 
 RUN mkdir /var/log/supervisord; \
     mkdir /var/run/supervisord;