diff --git a/Containers/nextcloud/cron.sh b/Containers/nextcloud/cron.sh
index 0fe5f589..87f6bf7a 100644
--- a/Containers/nextcloud/cron.sh
+++ b/Containers/nextcloud/cron.sh
@@ -1,7 +1,20 @@
 #!/bin/bash
 set -eu
 
+wait_for_cron() {
+    set -x
+    while [ -n "$(pgrep -f /var/www/html/cron.php)" ]; do
+        echo "Waiting for cron to stop..."
+        sleep 5
+    done
+    echo "Cronjob successfully exited."
+    set +x
+}
+
+trap wait_for_cron SIGINT SIGTERM
+
 while true; do
     php -f /var/www/html/cron.php &
-    sleep 5m
+    sleep 5m &
+    wait $!
 done
diff --git a/php/containers.json b/php/containers.json
index 977a97b0..b62c4236 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -215,6 +215,7 @@
         "APACHE_IP_BINDING=%APACHE_IP_BINDING%",
         "THIS_IS_AIO=true"
       ],
+      "stop_grace_period": 600,
       "restart": "unless-stopped",
       "devices": [
         "/dev/dri"