diff --git a/Dockerfile b/Dockerfile
index 8f18e599cd..37ed65b320 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,12 +19,14 @@ RUN set -eux; \
 		/app/public \
 		/config/caddy \
 		/data/caddy \
+		/etc/caddy; \
 		/etc/frankenphp; \
 	sed -i 's/php/frankenphp run/g' /usr/local/bin/docker-php-entrypoint; \
 	echo '<?php phpinfo();' > /app/public/index.php
 
-COPY --link caddy/frankenphp/Caddyfile /etc/frankenphp/Caddyfile
-RUN curl -sSLf \
+COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
+RUN ln /etc/caddy/Caddyfile /etc/frankenphp/Caddyfile && \
+	curl -sSLf \
 		-o /usr/local/bin/install-php-extensions \
 		https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
 	chmod +x /usr/local/bin/install-php-extensions
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 9c1155fb27..6d550c1dd3 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -18,12 +18,15 @@ RUN set -eux; \
 		/app/public \
 		/config/caddy \
 		/data/caddy \
+		/etc/caddy \
 		/etc/frankenphp; \
 	sed -i 's/php/frankenphp run/g' /usr/local/bin/docker-php-entrypoint; \
 	echo '<?php phpinfo();' > /app/public/index.php
 
-COPY --link caddy/frankenphp/Caddyfile /etc/frankenphp/Caddyfile
-RUN curl -sSLf \
+COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
+
+RUN ln /etc/caddy/Caddyfile /etc/frankenphp/Caddyfile && \
+	curl -sSLf \
 		-o /usr/local/bin/install-php-extensions \
 		https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
 	chmod +x /usr/local/bin/install-php-extensions