diff --git a/20/apache/Dockerfile b/20/apache/Dockerfile
index 043679191..cf65ec5e0 100644
--- a/20/apache/Dockerfile
+++ b/20/apache/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/20/apache/cron.sh b/20/apache/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/20/apache/cron.sh
+++ b/20/apache/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/20/fpm-alpine/Dockerfile b/20/fpm-alpine/Dockerfile
index 9453bca5f..ea4c6fe78 100644
--- a/20/fpm-alpine/Dockerfile
+++ b/20/fpm-alpine/Dockerfile
@@ -9,7 +9,8 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/20/fpm-alpine/cron.sh b/20/fpm-alpine/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/20/fpm-alpine/cron.sh
+++ b/20/fpm-alpine/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/20/fpm/Dockerfile b/20/fpm/Dockerfile
index e3255c809..98d64418e 100644
--- a/20/fpm/Dockerfile
+++ b/20/fpm/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/20/fpm/cron.sh b/20/fpm/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/20/fpm/cron.sh
+++ b/20/fpm/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/21/apache/Dockerfile b/21/apache/Dockerfile
index b47234f34..3cd730171 100644
--- a/21/apache/Dockerfile
+++ b/21/apache/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/21/apache/cron.sh b/21/apache/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/21/apache/cron.sh
+++ b/21/apache/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/21/fpm-alpine/Dockerfile b/21/fpm-alpine/Dockerfile
index 1ccf31b01..e5b92a0d1 100644
--- a/21/fpm-alpine/Dockerfile
+++ b/21/fpm-alpine/Dockerfile
@@ -9,7 +9,8 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/21/fpm-alpine/cron.sh b/21/fpm-alpine/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/21/fpm-alpine/cron.sh
+++ b/21/fpm-alpine/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/21/fpm/Dockerfile b/21/fpm/Dockerfile
index f769fc68d..939586334 100644
--- a/21/fpm/Dockerfile
+++ b/21/fpm/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/21/fpm/cron.sh b/21/fpm/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/21/fpm/cron.sh
+++ b/21/fpm/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/22/apache/Dockerfile b/22/apache/Dockerfile
index 90f0fb85e..2cab1f10e 100644
--- a/22/apache/Dockerfile
+++ b/22/apache/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/22/apache/cron.sh b/22/apache/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/22/apache/cron.sh
+++ b/22/apache/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/22/fpm-alpine/Dockerfile b/22/fpm-alpine/Dockerfile
index 98ceb949f..0569d920a 100644
--- a/22/fpm-alpine/Dockerfile
+++ b/22/fpm-alpine/Dockerfile
@@ -9,7 +9,8 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/22/fpm-alpine/cron.sh b/22/fpm-alpine/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/22/fpm-alpine/cron.sh
+++ b/22/fpm-alpine/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/22/fpm/Dockerfile b/22/fpm/Dockerfile
index 8fde133f0..82d9f8253 100644
--- a/22/fpm/Dockerfile
+++ b/22/fpm/Dockerfile
@@ -13,8 +13,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/22/fpm/cron.sh b/22/fpm/cron.sh
index 4dfa41181..b7ac95973 100755
--- a/22/fpm/cron.sh
+++ b/22/fpm/cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep 5m;
+done
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 4d05f14d0..0cc55e865 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -8,7 +8,8 @@ RUN set -ex; \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
-    echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index e6c48d545..f27c82e0a 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -12,8 +12,8 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
-    mkdir -p /var/spool/cron/crontabs; \
-    echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+    touch /usr/local/etc/php/conf.d/redis-session.ini; \
+    chmod o+rw /usr/local/etc/php/conf.d/redis-session.ini;
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
diff --git a/docker-cron.sh b/docker-cron.sh
index 4dfa41181..d38ea81fe 100755
--- a/docker-cron.sh
+++ b/docker-cron.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 set -eu
 
-exec busybox crond -f -l 0 -L /dev/stdout
+while [ 1 ]; do
+    (php -f /var/www/html/cron.php &);
+    sleep %%CRONTAB_INT%%m;
+done
diff --git a/update.sh b/update.sh
index e293a8006..bda4bba5c 100755
--- a/update.sh
+++ b/update.sh
@@ -111,7 +111,6 @@ function create_variant() {
 		s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
 		s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
-		s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
 	' "$dir/Dockerfile"
 
 	case "$phpVersion" in
@@ -132,6 +131,10 @@ function create_variant() {
 	for name in entrypoint cron; do
 		cp "docker-$name.sh" "$dir/$name.sh"
 	done
+	# Replace the variable.
+	sed -ri -e '
+		s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
+	' "$dir/cron.sh"
 
 	# Copy the upgrade.exclude
 	cp upgrade.exclude "$dir/"