diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 7cddbb0a..6d563b32 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -138,9 +138,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 4200fcdb..5b7382fb 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -130,9 +130,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index 070f3989..7b14e973 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -138,9 +138,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index 93a12239..9ff401ad 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -130,9 +130,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index 409b8035..87e41768 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -138,9 +138,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index 62544154..4f37e27b 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -130,9 +130,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index c4c01814..3050bcc6 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -130,9 +130,12 @@ RUN set -ex; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
     rm -rf /var/lib/apt/lists/*
+    \
+    mkdir -p /usr/src/apache
 
 COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
+COPY config/*.php /usr/src/nextcloud/config/
+COPY config/000-default.conf /usr/src/apache/
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["%%CMD%%"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b51ef6e1..49ede3cf 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -138,7 +138,7 @@ fi
   openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
-  mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/
+  mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
 ## einde SSL toevoegingen
 
 exec "$@"