diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index eb4a99c8..2c42d99f 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -8,7 +8,8 @@ RUN set -ex; \
         bzip2 \
         busybox-static \
     ; \
-    echo '*/15 * * * * www-data php -f /var/www/html/cron.php' > /etc/crontab; \
+    mkdir -p /var/spool/cron/crontabs; \
+    echo '*/15 * * * * php -f /var/www/html/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/11.0/apache/cron.sh b/11.0/apache/cron.sh
index d5f59e8d..bb65a1fb 100755
--- a/11.0/apache/cron.sh
+++ b/11.0/apache/cron.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 
-mkdir -p /var/spool/cron/crontabs
-
 exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index 705731c9..e10bb75d 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -8,7 +8,8 @@ RUN set -ex; \
         bzip2 \
         busybox-static \
     ; \
-    echo '*/15 * * * * www-data php -f /var/www/html/cron.php' > /etc/crontab; \
+    mkdir -p /var/spool/cron/crontabs; \
+    echo '*/15 * * * * php -f /var/www/html/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/11.0/fpm/cron.sh b/11.0/fpm/cron.sh
index d5f59e8d..bb65a1fb 100755
--- a/11.0/fpm/cron.sh
+++ b/11.0/fpm/cron.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 
-mkdir -p /var/spool/cron/crontabs
-
 exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 4e81de32..4a3e8673 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -8,7 +8,8 @@ RUN set -ex; \
         bzip2 \
         busybox-static \
     ; \
-    echo '*/15 * * * * www-data php -f /var/www/html/cron.php' > /etc/crontab; \
+    mkdir -p /var/spool/cron/crontabs; \
+    echo '*/15 * * * * php -f /var/www/html/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/12.0/apache/cron.sh b/12.0/apache/cron.sh
index d5f59e8d..bb65a1fb 100755
--- a/12.0/apache/cron.sh
+++ b/12.0/apache/cron.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 
-mkdir -p /var/spool/cron/crontabs
-
 exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 8a4555a8..2b6dca09 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -8,7 +8,8 @@ RUN set -ex; \
         bzip2 \
         busybox-static \
     ; \
-    echo '*/15 * * * * www-data php -f /var/www/html/cron.php' > /etc/crontab; \
+    mkdir -p /var/spool/cron/crontabs; \
+    echo '*/15 * * * * php -f /var/www/html/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/12.0/fpm/cron.sh b/12.0/fpm/cron.sh
index d5f59e8d..bb65a1fb 100755
--- a/12.0/fpm/cron.sh
+++ b/12.0/fpm/cron.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 
-mkdir -p /var/spool/cron/crontabs
-
 exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/Dockerfile.template b/Dockerfile.template
index 1675cd40..dc7b8cb3 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -8,7 +8,8 @@ RUN set -ex; \
         bzip2 \
         busybox-static \
     ; \
-    echo '*/15 * * * * www-data php -f /var/www/html/cron.php' > /etc/crontab; \
+    mkdir -p /var/spool/cron/crontabs; \
+    echo '*/15 * * * * php -f /var/www/html/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-cron.sh b/docker-cron.sh
index d5f59e8d..bb65a1fb 100755
--- a/docker-cron.sh
+++ b/docker-cron.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 
-mkdir -p /var/spool/cron/crontabs
-
 exec busybox crond -f -l 0 -L /dev/stdout