diff --git a/roles/sys-ctl-hlth-csp/tasks/01_core.yml b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
index 24433baa..2c63aca9 100644
--- a/roles/sys-ctl-hlth-csp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
@@ -13,8 +13,11 @@
 - include_role:
     name: sys-service
   vars:
+    system_service_suppress_flush:        true # The healthcheck will just work after all routines passed
     system_service_on_calendar:           "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
     system_service_timer_enabled:         true
     system_service_tpl_on_failure:        "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
     system_service_tpl_timeout_start_sec: "{{ CURRENT_PLAY_DOMAINS_ALL | timeout_start_sec_for_domains }}"
     system_service_tpl_exec_start:        "{{ system_service_script_exec }} --nginx-config-dir={{ NGINX.DIRECTORIES.HTTP.SERVERS }}"
+
+- include_tasks: utils/run_once.yml
diff --git a/roles/sys-ctl-hlth-csp/tasks/main.yml b/roles/sys-ctl-hlth-csp/tasks/main.yml
index 16f8dcde..f3038984 100644
--- a/roles/sys-ctl-hlth-csp/tasks/main.yml
+++ b/roles/sys-ctl-hlth-csp/tasks/main.yml
@@ -1,4 +1,3 @@
 - block:
     - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
   when: run_once_sys_ctl_hlth_csp is not defined
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
index b02543d5..ab5240e5 100644
--- a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
@@ -24,3 +24,6 @@
       {{ system_service_script_exec }}
       --web-protocol {{ WEB_PROTOCOL }}
       --expectations '{{ applications | web_health_expectations(www_enabled=WWW_REDIRECT_ENABLED, group_names=group_names) | to_json }}'
+    system_service_suppress_flush:        true # The healthcheck will just work after all routines passed
+
+- include_tasks: utils/run_once.yml
diff --git a/roles/sys-ctl-hlth-webserver/tasks/main.yml b/roles/sys-ctl-hlth-webserver/tasks/main.yml
index 124ab3a0..a0d2a885 100644
--- a/roles/sys-ctl-hlth-webserver/tasks/main.yml
+++ b/roles/sys-ctl-hlth-webserver/tasks/main.yml
@@ -1,6 +1,5 @@
 - block:
     - include_tasks: 01_core.yml
-    - include_tasks: utils/run_once.yml
   when: run_once_sys_ctl_hlth_webserver is not defined