diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index 9a33b28a..eb4a99c8 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -88,7 +88,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/11.0/apache/cron.sh b/11.0/apache/cron.sh
new file mode 100755
index 00000000..d5f59e8d
--- /dev/null
+++ b/11.0/apache/cron.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+mkdir -p /var/spool/cron/crontabs
+
+exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/11.0/apache/docker-entrypoint.sh b/11.0/apache/entrypoint.sh
similarity index 100%
rename from 11.0/apache/docker-entrypoint.sh
rename to 11.0/apache/entrypoint.sh
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index 32e4849a..705731c9 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/11.0/fpm/cron.sh b/11.0/fpm/cron.sh
new file mode 100755
index 00000000..d5f59e8d
--- /dev/null
+++ b/11.0/fpm/cron.sh
@@ -0,0 +1,6 @@
+#!/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/docker-entrypoint.sh b/11.0/fpm/entrypoint.sh
similarity index 100%
rename from 11.0/fpm/docker-entrypoint.sh
rename to 11.0/fpm/entrypoint.sh
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 91e489ee..4e81de32 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -88,7 +88,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/12.0/apache/cron.sh b/12.0/apache/cron.sh
new file mode 100755
index 00000000..d5f59e8d
--- /dev/null
+++ b/12.0/apache/cron.sh
@@ -0,0 +1,6 @@
+#!/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/docker-entrypoint.sh b/12.0/apache/entrypoint.sh
similarity index 100%
rename from 12.0/apache/docker-entrypoint.sh
rename to 12.0/apache/entrypoint.sh
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 6835f707..8a4555a8 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -87,7 +87,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/12.0/fpm/cron.sh b/12.0/fpm/cron.sh
new file mode 100755
index 00000000..d5f59e8d
--- /dev/null
+++ b/12.0/fpm/cron.sh
@@ -0,0 +1,6 @@
+#!/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/docker-entrypoint.sh b/12.0/fpm/entrypoint.sh
similarity index 100%
rename from 12.0/fpm/docker-entrypoint.sh
rename to 12.0/fpm/entrypoint.sh
diff --git a/Dockerfile.template b/Dockerfile.template
index 57722d80..1675cd40 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -87,7 +87,7 @@ RUN set -ex; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY *.sh /
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker-cron.sh b/docker-cron.sh
new file mode 100755
index 00000000..d5f59e8d
--- /dev/null
+++ b/docker-cron.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+mkdir -p /var/spool/cron/crontabs
+
+exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/update.sh b/update.sh
index 2920d073..2fb6f4c0 100755
--- a/update.sh
+++ b/update.sh
@@ -51,8 +51,10 @@ for latest in "${latests[@]}"; do
 				s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g;
 			' "$version/$variant/Dockerfile"
 
-			# Copy the docker-entrypoint.
-			cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
+			# Copy the shell scripts
+			for name in entrypoint cron; do
+				cp "docker-$name.sh" "$version/$variant/$name.sh"
+			done
 
 			# Copy the config directory
 			cp -rT .config "$version/$variant/config"