diff --git a/roles/srv-core/tasks/01_core.yml b/roles/srv-core/tasks/01_core.yml
index 1a5accf4..21163d49 100644
--- a/roles/srv-core/tasks/01_core.yml
+++ b/roles/srv-core/tasks/01_core.yml
@@ -25,16 +25,6 @@
     dest: "{{ NGINX.FILES.CONFIGURATION }}"
   notify: docker compose up
 
-- name: Include health dependencies
-  include_role:
-    name: "{{ item }}"
-  loop:
-    - sys-ctl-hlth-webserver
-    - sys-ctl-hlth-csp
-  vars:
-    # Extra flush is for performance reasons not necessary
-    flush_handlers: false
-
 - name: Include openresty
   # Outside of run_once block is necessary for handler loading
   # Otherwise the when: condition from the block is added to the handlers
@@ -49,4 +39,13 @@
   vars:
     # Flush openresty handler on first run, so that openresty is up, before openresty related handlers are triggered
     flush_handlers: true
-  when: run_once_svc_prx_openresty is not defined
\ No newline at end of file
+  when: run_once_svc_prx_openresty is not defined
+
+- name: Include health dependencies
+  include_role:
+    name: "{{ item }}"
+  loop:
+    - sys-ctl-hlth-webserver
+    - sys-ctl-hlth-csp
+  vars:
+    flush_handlers: false
diff --git a/roles/sys-ctl-hlth-csp/tasks/01_core.yml b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
index 233da99d..effb3d55 100644
--- a/roles/sys-ctl-hlth-csp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
@@ -13,6 +13,7 @@
 - include_role:
     name: sys-service
   vars:
-    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_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: 15min