diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 8f34f05f..98038694 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index f9107aaf..affcb6ab 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 31f3ea92..0ea32fcb 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index 811265c0..f9b078f8 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index d691bdee..277a1904 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index ff6d717b..ab48ddd0 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index e29a3fb8..e44a176b 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
index 8177cb0b..47f6f0c0 100644
--- a/15.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index 730c9651..ad19e164 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/16.0-alpha/apache/Dockerfile b/16.0-alpha/apache/Dockerfile
index f70f2a24..a31e4312 100644
--- a/16.0-alpha/apache/Dockerfile
+++ b/16.0-alpha/apache/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/16.0-alpha/apache/entrypoint.sh b/16.0-alpha/apache/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/16.0-alpha/apache/entrypoint.sh
+++ b/16.0-alpha/apache/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/16.0-alpha/fpm-alpine/Dockerfile b/16.0-alpha/fpm-alpine/Dockerfile
index ab069523..8fa1d1df 100644
--- a/16.0-alpha/fpm-alpine/Dockerfile
+++ b/16.0-alpha/fpm-alpine/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/16.0-alpha/fpm-alpine/entrypoint.sh b/16.0-alpha/fpm-alpine/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/16.0-alpha/fpm-alpine/entrypoint.sh
+++ b/16.0-alpha/fpm-alpine/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/16.0-alpha/fpm/Dockerfile b/16.0-alpha/fpm/Dockerfile
index a4013055..0418f9f5 100644
--- a/16.0-alpha/fpm/Dockerfile
+++ b/16.0-alpha/fpm/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/16.0-alpha/fpm/entrypoint.sh b/16.0-alpha/fpm/entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/16.0-alpha/fpm/entrypoint.sh
+++ b/16.0-alpha/fpm/entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index af4767e6..c6da9f28 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -10,7 +10,7 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index d1c38583..74126337 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -14,7 +14,7 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*; \
     \
     mkdir -p /var/spool/cron/crontabs; \
-    echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
+    echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 82f37879..e60ae9e9 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
 else
     mkdir -p $NEXTCLOUD_BASE_DIR
     if [ -f /usr/sbin/apache2ctl ]; then
-        sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
+        sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
         sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
     fi
 fi