diff --git a/roles/docker-compose/vars/main.yml b/roles/docker-compose/vars/main.yml
index e2c34e17..61c433f8 100644
--- a/roles/docker-compose/vars/main.yml
+++ b/roles/docker-compose/vars/main.yml
@@ -1,2 +1,2 @@
-DOCKER_COMPOSE_VARIABLE_FILE:             "{{ role_path }}/vars/docker-compose.yml"
-DOCKER_COMPOSE_DOWN_ALL_PACKAGE:          "docodol"
\ No newline at end of file
+DOCKER_COMPOSE_VARIABLE_FILE:     "{{ role_path }}/vars/docker-compose.yml"
+DOCKER_COMPOSE_DOWN_ALL_PACKAGE:  "docodol"
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml b/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml
new file mode 100644
index 00000000..6fe8fb97
--- /dev/null
+++ b/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml
@@ -0,0 +1,11 @@
+- name: Include dependency 'sys-ctl-alm-compose'
+  include_role:
+    name: sys-ctl-alm-compose
+  when: run_once_sys_ctl_alm_compose is not defined
+
+- include_role:
+  name: sys-service
+  vars:
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
+    system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-disc-space/tasks/main.yml b/roles/sys-ctl-hlth-disc-space/tasks/main.yml
index 4534fc28..a9f417ab 100644
--- a/roles/sys-ctl-hlth-disc-space/tasks/main.yml
+++ b/roles/sys-ctl-hlth-disc-space/tasks/main.yml
@@ -1,15 +1,4 @@
 - block:
-  - name: Include dependency 'sys-ctl-alm-compose'
-    include_role:
-      name: sys-ctl-alm-compose
-    when: run_once_sys_ctl_alm_compose is not defined
-  - include_tasks: utils/run_once.yml
-  - include_role:
-      name: sys-service
-      vars:
-        system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
-        system_service_timer_enabled:  true
-        system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
-  - name: "Flush handlers a second time"
-    include_tasks: utils/run_once.yml
-  when: run_once_sys_ctl_hlth_disc_space is not defined
+    - include_tasks: 01_core.yml
+    - include_tasks: utils/run_once.yml
+  when: run_once_sys_ctl_hlth_disc_space is not defined
\ No newline at end of file