diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile
index e1b794d7518..d42001f1f92 100644
--- a/Containers/clamav/Dockerfile
+++ b/Containers/clamav/Dockerfile
@@ -23,4 +23,6 @@ USER 100
 
 LABEL com.centurylinklabs.watchtower.enable="false"
 
+HEALTHCHECK --start-period=60s --retries=9 CMD clamdcheck.sh
+
 ENTRYPOINT ["/init-unprivileged"]
diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile
index 277a09dc573..137a12c83bb 100644
--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -20,5 +20,5 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
 
 USER 100
 
-HEALTHCHECK --start-period=360s CMD /healthcheck.sh
+HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
 LABEL com.centurylinklabs.watchtower.enable="false"
diff --git a/Containers/onlyoffice/Dockerfile b/Containers/onlyoffice/Dockerfile
index bfecd246362..6fdac5bdc51 100644
--- a/Containers/onlyoffice/Dockerfile
+++ b/Containers/onlyoffice/Dockerfile
@@ -6,5 +6,5 @@ FROM onlyoffice/documentserver:8.2.2.1
 
 COPY --chmod=775 healthcheck.sh /healthcheck.sh
 
-HEALTHCHECK --start-period=360s CMD /healthcheck.sh
+HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
 LABEL com.centurylinklabs.watchtower.enable="false"
diff --git a/manual-install/latest.yml b/manual-install/latest.yml
index 56f96b6dad1..15af7f53cfb 100644
--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@@ -240,12 +240,12 @@ services:
     image: nextcloud/aio-collabora:latest
     init: true
     healthcheck:
-      start_period: 360s
+      start_period: 60s
       test: /healthcheck.sh
       interval: 30s
       timeout: 30s
       start_interval: 5s
-      retries: 3
+      retries: 9
     expose:
       - "9980"
     environment:
@@ -337,12 +337,12 @@ services:
     user: "100"
     init: false
     healthcheck:
-      start_period: 360s
+      start_period: 60s
       test: clamdcheck.sh
       interval: 30s
       timeout: 30s
       start_interval: 5s
-      retries: 3
+      retries: 9
     expose:
       - "3310"
     environment:
@@ -366,12 +366,12 @@ services:
     image: nextcloud/aio-onlyoffice:latest
     init: true
     healthcheck:
-      start_period: 360s
+      start_period: 60s
       test: /healthcheck.sh
       interval: 30s
       timeout: 30s
       start_interval: 5s
-      retries: 3
+      retries: 9
     expose:
       - "80"
     environment:
diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
index 31840d04286..b9404df34a7 100755
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
@@ -67,16 +67,16 @@ spec:
             exec:
               command:
                 - clamdcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           livenessProbe:
             exec:
               command:
                 - clamdcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           name: nextcloud-aio-clamav
diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
index dd0d05fbd82..9c2224863d8 100755
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
@@ -39,16 +39,16 @@ spec:
             exec:
               command:
                 - /healthcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           livenessProbe:
             exec:
               command:
                 - /healthcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           name: nextcloud-aio-collabora
diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
index 8b08f2c9e80..f3693fc1452 100755
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
@@ -47,16 +47,16 @@ spec:
             exec:
               command:
                 - /healthcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           livenessProbe:
             exec:
               command:
                 - /healthcheck.sh
-            failureThreshold: 3
-            initialDelaySeconds: 360
+            failureThreshold: 9
+            initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 30
           name: nextcloud-aio-onlyoffice
diff --git a/php/containers.json b/php/containers.json
index 173f1ed26be..a65530391f3 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -375,12 +375,12 @@
       "image": "nextcloud/aio-collabora",
       "init": true,
       "healthcheck": {
-        "start_period": "360s",
+        "start_period": "60s",
         "test": "/healthcheck.sh",
         "interval": "30s",
         "timeout": "30s",
         "start_interval": "5s",
-        "retries": 3
+        "retries": 9
       },
       "expose": [
         "9980"
@@ -657,12 +657,12 @@
       "user": "100",
       "init": false,
       "healthcheck": {
-        "start_period": "360s",
+        "start_period": "60s",
         "test": "clamdcheck.sh",
         "interval": "30s",
         "timeout": "30s",
         "start_interval": "5s",
-        "retries": 3
+        "retries": 9
       },
       "expose": [
         "3310"
@@ -704,12 +704,12 @@
       "image": "nextcloud/aio-onlyoffice",
       "init": true,
       "healthcheck": {
-        "start_period": "360s",
+        "start_period": "60s",
         "test": "/healthcheck.sh",
         "interval": "30s",
         "timeout": "30s",
         "start_interval": "5s",
-        "retries": 3
+        "retries": 9
       },
       "expose": [
         "80"