diff --git a/roles/sys-ctl-alm-compose/tasks/01_core.yml b/roles/sys-ctl-alm-compose/tasks/01_core.yml
index b785df8e..a36a1249 100644
--- a/roles/sys-ctl-alm-compose/tasks/01_core.yml
+++ b/roles/sys-ctl-alm-compose/tasks/01_core.yml
@@ -21,7 +21,9 @@
     system_service_tpl_exec_start: "{{ system_service_script_exec }} %I"
     system_service_tpl_on_failure: "" # No on failure needed, because it's anyhow the default on failure procedure
 
-- block:
+- name: Assert '{{ system_service_id }}'
+  block:
+  
   - name: Escape instance name for systemctl call
     ansible.builtin.command:
       argv:
@@ -30,8 +32,8 @@
     register: escaped_name
     changed_when: false
 
-  - name: Start sys-ctl-alm-compose instance
+  - name: Start '{{ system_service_id }}' instance
     ansible.builtin.systemd:
-      name: "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) ~ escaped_name.stdout ~ '.service' }}"
+      name: "{{ system_service_id | get_service_name(SOFTWARE_NAME, False) ~ escaped_name.stdout }}.service"
       state: started
   when: MODE_ASSERT | bool
diff --git a/roles/sys-ctl-hlth-msmtp/tasks/main.yml b/roles/sys-ctl-hlth-msmtp/tasks/main.yml
index ea604859..5a508e3c 100644
--- a/roles/sys-ctl-hlth-msmtp/tasks/main.yml
+++ b/roles/sys-ctl-hlth-msmtp/tasks/main.yml
@@ -1,4 +1,3 @@
 - block:
   - include_tasks: 01_core.yml
   when: run_once_sys_ctl_hlth_msmtp is not defined
-