diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
index a32c762..fe45442 100644
--- a/charts/docker-mailserver/templates/deployment.yaml
+++ b/charts/docker-mailserver/templates/deployment.yaml
@@ -185,19 +185,20 @@ spec:
                command:
                  - /bin/bash
                  - -c
-                 - supervisorctl status | grep -E "amavis|clamav|cron|dovecot|mailserver|opendkim|opendmarc|postfix|rsyslog" | grep RUNNING
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 3
+                 - supervisorctl status cron mailserver postfix rsyslog
+                 # TODO: conditionally? add 'amavis changedetector clamav cron dovecot fail2ban fetchmail mta-sts-daemon opendkim opendmarc postgrey postsrsd rspamd rspamd-redis saslauthd_ldap saslauthd_mysql saslauthd_pam saslauthd_rimap saslauthd_shadow'
+            initialDelaySeconds: 60
+            timeoutSeconds: 60
+            failureThreshold: 5
           readinessProbe:
             exec:
                command:
                  - /bin/bash
                  - -c
-                 - supervisorctl status | grep -E "mailserver|postfix" | grep RUNNING
-            initialDelaySeconds: 10
-            timeoutSeconds: 5
-            failureThreshold: 3
+                 - supervisorctl status mailserver postfix
+            initialDelaySeconds: 60
+            timeoutSeconds: 60
+            failureThreshold: 10
           ports:
             - name: smtp
               containerPort: 25