diff --git a/group_vars/all/07_services.yml b/group_vars/all/07_services.yml
index 8a98485e..b6b06d30 100644
--- a/group_vars/all/07_services.yml
+++ b/group_vars/all/07_services.yml
@@ -3,8 +3,6 @@
 
 ## Meta
 SYS_SERVICE_SUFFIX:                   ".{{ SOFTWARE_NAME | lower }}.service"
-SYS_SERVICE_ALL_ENABLED:              "{{ not MODE_DEBUG }}" # Flush all services
-SYS_SERVICE_DEFAULT_STATE:            "{{ 'restarted' if MODE_DEBUG else omit }}"
 
 ## Names
 SYS_SERVICE_CLEANUP_BACKUPS_OLD:      "{{ 'sys-ctl-cln-bkps'        | get_service_name(SOFTWARE_NAME) }}"
diff --git a/group_vars/all/08_timer.yml b/group_vars/all/08_timer.yml
index 745418bf..4b01e135 100644
--- a/group_vars/all/08_timer.yml
+++ b/group_vars/all/08_timer.yml
@@ -7,8 +7,8 @@ SYS_TIMER_ALL_ENABLED:  "{{ not MODE_DEBUG }}"   # Runtime Variables for Process
 
 ## Server Tact Variables 
 
-HOURS_SERVER_AWAKE:   "0..23" # Ours in which the server is "awake" (100% working). Rest of the time is reserved for maintanance
-RANDOMIZED_DELAY_SEC: "5min"  # Random delay for systemd timers to avoid peak loads.
+HOURS_SERVER_AWAKE:            "0..23" # Ours in which the server is "awake" (100% working). Rest of the time is reserved for maintanance
+RANDOMIZED_DELAY_SEC:          "5min"  # Random delay for systemd timers to avoid peak loads.
 
 ## Timeouts for all services
 SYS_TIMEOUT_CLEANUP_SERVICES:  "15min"
diff --git a/roles/svc-bkp-loc-2-usb/tasks/main.yml b/roles/svc-bkp-loc-2-usb/tasks/main.yml
index aaf318a2..bc734d3d 100644
--- a/roles/svc-bkp-loc-2-usb/tasks/main.yml
+++ b/roles/svc-bkp-loc-2-usb/tasks/main.yml
@@ -23,4 +23,4 @@
       to non‑empty values in your configuration file.
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
diff --git a/roles/svc-bkp-loc-2-usb/templates/systemctl.service.j2 b/roles/svc-bkp-loc-2-usb/templates/systemctl.service.j2
index cb03a67a..e01d55b0 100644
--- a/roles/svc-bkp-loc-2-usb/templates/systemctl.service.j2
+++ b/roles/svc-bkp-loc-2-usb/templates/systemctl.service.j2
@@ -5,7 +5,7 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} {{ BACKUP_TO_USB_SOURCE }} {{ BACKUP_TO_USB_DESTINATION }}
+ExecStart={{ system_service_script_exec }} {{ BACKUP_TO_USB_SOURCE }} {{ BACKUP_TO_USB_DESTINATION }}
 ExecStartPost=/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS_OLD }}
 
 [Install]
diff --git a/roles/svc-bkp-loc-2-usb/vars/main.yml b/roles/svc-bkp-loc-2-usb/vars/main.yml
index 647243dc..4717443f 100644
--- a/roles/svc-bkp-loc-2-usb/vars/main.yml
+++ b/roles/svc-bkp-loc-2-usb/vars/main.yml
@@ -1,5 +1,5 @@
 application_id:                 "svc-bkp-loc-2-usb"
-systemctl_id:                   "{{ application_id }}"
+system_service_id:                   "{{ application_id }}"
 
 BACKUP_TO_USB_DESTINATION:      '{{ BACKUP_TO_USB_MOUNT}}{{ BACKUP_TO_USB_TARGET }}'
 BACKUPS_SERVICE_MNT_NAME:       '{{ BACKUP_TO_USB_MOUNT | trim(''/'') | replace(''/'',''-'') }}.mount'
diff --git a/roles/svc-bkp-rmt-2-loc/tasks/main.yml b/roles/svc-bkp-rmt-2-loc/tasks/main.yml
index 8218f801..a2d03ea8 100644
--- a/roles/svc-bkp-rmt-2-loc/tasks/main.yml
+++ b/roles/svc-bkp-rmt-2-loc/tasks/main.yml
@@ -23,8 +23,8 @@
     mode: "0755"
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_timer_enabled:  true
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_BACKUP_REMOTE_TO_LOCAL }}"
+    system_service_timer_enabled:  true
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_BACKUP_REMOTE_TO_LOCAL }}"
 
diff --git a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
index b59f1c78..99ff847b 100644
--- a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
+++ b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2
@@ -5,5 +5,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS| join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
-ExecStart={{ systemctl_script_exec }}
+ExecStart={{ system_service_script_exec }}
 ExecStartPost=/bin/systemctl start {{ SYS_SERVICE_CLEANUP_BACKUPS_OLD }}
diff --git a/roles/svc-bkp-rmt-2-loc/vars/main.yml b/roles/svc-bkp-rmt-2-loc/vars/main.yml
index c6ca8d1b..54508f13 100644
--- a/roles/svc-bkp-rmt-2-loc/vars/main.yml
+++ b/roles/svc-bkp-rmt-2-loc/vars/main.yml
@@ -1,5 +1,5 @@
 application_id:                                 svc-bkp-rmt-2-loc
-systemctl_id:                                   "{{ application_id }}"  
+system_service_id:                                   "{{ application_id }}"  
 DOCKER_BACKUP_REMOTE_2_LOCAL_DIR:               '{{ PATH_ADMINISTRATOR_SCRIPTS }}{{ application_id }}/'
 DOCKER_BACKUP_REMOTE_2_LOCAL_SCRIPT:            "{{ DOCKER_BACKUP_REMOTE_2_LOCAL_DIR }}svc-bkp-rmt-2-loc.sh"
 DOCKER_BACKUP_REMOTE_2_LOCAL_BACKUP_PROVIDERS:  "{{ applications | get_app_conf(application_id, 'backup_providers')  }}"
\ No newline at end of file
diff --git a/roles/svc-net-wireguard-plain/tasks/main.yml b/roles/svc-net-wireguard-plain/tasks/main.yml
index 96251896..85b1e4b6 100644
--- a/roles/svc-net-wireguard-plain/tasks/main.yml
+++ b/roles/svc-net-wireguard-plain/tasks/main.yml
@@ -1,2 +1,2 @@
 - include_role:
-    name: sys-systemctl
\ No newline at end of file
+    name: sys-service
\ No newline at end of file
diff --git a/roles/svc-net-wireguard-plain/templates/systemctl.service.j2 b/roles/svc-net-wireguard-plain/templates/systemctl.service.j2
index 5bed5d2f..0c596690 100644
--- a/roles/svc-net-wireguard-plain/templates/systemctl.service.j2
+++ b/roles/svc-net-wireguard-plain/templates/systemctl.service.j2
@@ -4,7 +4,7 @@ Before=wg-quick@wg0.service
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }}
+ExecStart={{ system_service_script_exec }}
 
 [Install]
 RequiredBy=wg-quick@wg0.service
\ No newline at end of file
diff --git a/roles/svc-net-wireguard-plain/vars/main.yml b/roles/svc-net-wireguard-plain/vars/main.yml
index 3d2e49f4..8a8153cf 100644
--- a/roles/svc-net-wireguard-plain/vars/main.yml
+++ b/roles/svc-net-wireguard-plain/vars/main.yml
@@ -1,2 +1,2 @@
 application_id: svc-net-wireguard-plain
-systemctl_id:   "{{ application_id }}"
+system_service_id:   "{{ application_id }}"
diff --git a/roles/svc-opt-keyboard-color/tasks/01_core.yml b/roles/svc-opt-keyboard-color/tasks/01_core.yml
index 3708ceb4..7df209b0 100644
--- a/roles/svc-opt-keyboard-color/tasks/01_core.yml
+++ b/roles/svc-opt-keyboard-color/tasks/01_core.yml
@@ -11,8 +11,8 @@
     - msi-perkeyrgb
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_ANIMATION_KEYBOARD_COLOR }}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_ANIMATION_KEYBOARD_COLOR }}"
+    system_service_timer_enabled:  true
     persistent:               true
diff --git a/roles/svc-opt-keyboard-color/templates/systemctl.service.j2 b/roles/svc-opt-keyboard-color/templates/systemctl.service.j2
index 7694bf17..1350f23d 100644
--- a/roles/svc-opt-keyboard-color/templates/systemctl.service.j2
+++ b/roles/svc-opt-keyboard-color/templates/systemctl.service.j2
@@ -4,4 +4,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} {{ vendor_and_product_id }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }} {{ vendor_and_product_id }}
\ No newline at end of file
diff --git a/roles/svc-opt-keyboard-color/vars/main.yml b/roles/svc-opt-keyboard-color/vars/main.yml
index 6e1be863..172adef9 100644
--- a/roles/svc-opt-keyboard-color/vars/main.yml
+++ b/roles/svc-opt-keyboard-color/vars/main.yml
@@ -1,3 +1,3 @@
 application_id: svc-opt-keyboard-color
-systemctl_id:   "{{ application_id }}"
+system_service_id:   "{{ application_id }}"
 vendor_and_product_id:  "{{ applications | get_app_conf(application_id, 'vendor_and_product_id') }}"
diff --git a/roles/svc-opt-ssd-hdd/tasks/main.yml b/roles/svc-opt-ssd-hdd/tasks/main.yml
index 96251896..85b1e4b6 100644
--- a/roles/svc-opt-ssd-hdd/tasks/main.yml
+++ b/roles/svc-opt-ssd-hdd/tasks/main.yml
@@ -1,2 +1,2 @@
 - include_role:
-    name: sys-systemctl
\ No newline at end of file
+    name: sys-service
\ No newline at end of file
diff --git a/roles/svc-opt-ssd-hdd/templates/systemctl.service.j2 b/roles/svc-opt-ssd-hdd/templates/systemctl.service.j2
index 32a3cb32..6e1f89a7 100644
--- a/roles/svc-opt-ssd-hdd/templates/systemctl.service.j2
+++ b/roles/svc-opt-ssd-hdd/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_OPTIMIZE_DRIVE }} {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_STORAGE_OPTIMIZER }}"
-ExecStart={{ systemctl_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }}
\ No newline at end of file
diff --git a/roles/svc-opt-ssd-hdd/vars/main.yml b/roles/svc-opt-ssd-hdd/vars/main.yml
index 6bf8a04e..98f447ef 100644
--- a/roles/svc-opt-ssd-hdd/vars/main.yml
+++ b/roles/svc-opt-ssd-hdd/vars/main.yml
@@ -1,4 +1,4 @@
 application_id:               svc-opt-ssd-hdd
-systemctl_id:                 "{{ application_id }}"
+system_service_id:                 "{{ application_id }}"
 OPT_DRIVE_RAPID_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.rapid_storage') }}"
 OPT_DRIVE_MASS_STORAGE_PATH:  "{{ applications | get_app_conf(application_id, 'volumes.mass_storage') }}"
diff --git a/roles/sys-ctl-alm-compose/tasks/01_core.yml b/roles/sys-ctl-alm-compose/tasks/01_core.yml
index 38c62066..339199a8 100644
--- a/roles/sys-ctl-alm-compose/tasks/01_core.yml
+++ b/roles/sys-ctl-alm-compose/tasks/01_core.yml
@@ -1,4 +1,4 @@
-- name: "Include dependent services for '{{ systemctl_id }}'"
+- name: "Include dependent services for '{{ system_service_id  }}'"
   include_role:
     name: '{{ item }}'
   loop:
@@ -9,14 +9,14 @@
     systemctl_timer_enabled: false
     systemctl_copy_files: true
 
-- name: "Include core service for '{{ systemctl_id }}'"
+- name: "Include core service for '{{ system_service_id  }}'"
   include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
     flush_handlers: true
     systemctl_timer_enabled: false
     systemctl_copy_files: true
-    systemctl_tpl_exec_start: "{{ systemctl_script_exec }} %i"
+    systemctl_tpl_exec_start: "{{ system_service_script_exec }} %i"
     systemctl_tpl_on_failure: "" # No on failure needed, because it's anyhow the default on failure procedure
 
 - name: "Send message to test service."
diff --git a/roles/sys-ctl-alm-compose/vars/main.yml b/roles/sys-ctl-alm-compose/vars/main.yml
index c7d1cde6..916ce01b 100644
--- a/roles/sys-ctl-alm-compose/vars/main.yml
+++ b/roles/sys-ctl-alm-compose/vars/main.yml
@@ -1,4 +1,4 @@
-systemctl_id: sys-ctl-alm-compose@
+system_service_id: sys-ctl-alm-compose@
 
 SYSTEMCTL_ALARM_COMPOSER_SUBSERVICES:
   - 'sys-ctl-alm-email'
diff --git a/roles/sys-ctl-alm-email/README.md b/roles/sys-ctl-alm-email/README.md
index 2dd6c45e..2fc5a075 100644
--- a/roles/sys-ctl-alm-email/README.md
+++ b/roles/sys-ctl-alm-email/README.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-This role installs and configures the necessary components for sending email notifications via systemd when a service fails. It sets up the `{{ systemctl_id }}` service and configures email parameters and templates using msmtp.
+This role installs and configures the necessary components for sending email notifications via systemd when a service fails. It sets up the `{{ system_service_id }}` service and configures email parameters and templates using msmtp.
 
 ## Overview
 
diff --git a/roles/sys-ctl-alm-email/tasks/01_core.yml b/roles/sys-ctl-alm-email/tasks/01_core.yml
index 61541e17..7e8f33c0 100644
--- a/roles/sys-ctl-alm-email/tasks/01_core.yml
+++ b/roles/sys-ctl-alm-email/tasks/01_core.yml
@@ -5,8 +5,8 @@
   - sys-svc-msmtp
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_copy_files: true
+    system_service_copy_files: true
 
 
diff --git a/roles/sys-ctl-alm-email/templates/systemctl@.service.j2 b/roles/sys-ctl-alm-email/templates/systemctl@.service.j2
index f04d2b70..bb9d132e 100644
--- a/roles/sys-ctl-alm-email/templates/systemctl@.service.j2
+++ b/roles/sys-ctl-alm-email/templates/systemctl@.service.j2
@@ -3,6 +3,6 @@ Description=status email for %i to user
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} %i
+ExecStart={{ system_service_script_exec }} %i
 User=root
 Group=systemd-journal
diff --git a/roles/sys-ctl-alm-email/vars/main.yml b/roles/sys-ctl-alm-email/vars/main.yml
index fc53fd40..982285f4 100644
--- a/roles/sys-ctl-alm-email/vars/main.yml
+++ b/roles/sys-ctl-alm-email/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-alm-email@
+system_service_id: sys-ctl-alm-email@
diff --git a/roles/sys-ctl-alm-telegram/tasks/01_core.yml b/roles/sys-ctl-alm-telegram/tasks/01_core.yml
index cbfe6278..ef7c05f6 100644
--- a/roles/sys-ctl-alm-telegram/tasks/01_core.yml
+++ b/roles/sys-ctl-alm-telegram/tasks/01_core.yml
@@ -10,9 +10,9 @@
         - telegram_chat_id     # The Telegram chat ID to send messages to
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_copy_files: true
+    system_service_copy_files: true
 
 - name: install curl
   community.general.pacman:
diff --git a/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2 b/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2
index b51bb2a9..3c6e6c16 100644
--- a/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2
+++ b/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2
@@ -3,6 +3,6 @@ Description=status Telegram message for %i to user
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} %i
+ExecStart={{ system_service_script_exec }} %i
 User=root
 Group=systemd-journal
diff --git a/roles/sys-ctl-alm-telegram/vars/main.yml b/roles/sys-ctl-alm-telegram/vars/main.yml
index 20dc5d0f..4d1b8916 100644
--- a/roles/sys-ctl-alm-telegram/vars/main.yml
+++ b/roles/sys-ctl-alm-telegram/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-alm-telegram@
+system_service_id: sys-ctl-alm-telegram@
diff --git a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
index 90be7f17..afbcda1c 100644
--- a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
+++ b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
@@ -15,8 +15,8 @@
   when: MODE_RESET | bool
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_copy_files:     false
-    systemctl_timer_enabled:  false
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_BACKUP_DOCKER_TO_LOCAL }}"
+    system_service_copy_files:     false
+    system_service_timer_enabled:  false
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_BACKUP_DOCKER_TO_LOCAL }}"
diff --git a/roles/sys-ctl-bkp-docker-2-loc/vars/main.yml b/roles/sys-ctl-bkp-docker-2-loc/vars/main.yml
index 600a3d55..37efcf82 100644
--- a/roles/sys-ctl-bkp-docker-2-loc/vars/main.yml
+++ b/roles/sys-ctl-bkp-docker-2-loc/vars/main.yml
@@ -5,7 +5,7 @@
 # - BKP_DOCKER_2_LOC_DISABLED:         All images where backup.disabled is set (for --images-no-backup-required)
 # CLI-ready variables render these lists as argument strings.
 
-systemctl_id: sys-ctl-bkp-docker-2-loc
+system_service_id: sys-ctl-bkp-docker-2-loc
 
 # Verify if DB is enabled
 BKP_DOCKER_2_LOC_DB_ENABLED: "{{ database_type | default('') | bool }}"
diff --git a/roles/sys-ctl-cln-bkps/tasks/01_core.yml b/roles/sys-ctl-cln-bkps/tasks/01_core.yml
index fa50959c..c3536c1d 100644
--- a/roles/sys-ctl-cln-bkps/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-bkps/tasks/01_core.yml
@@ -14,4 +14,4 @@
     state: present
 
 - include_role:
-    name: sys-systemctl
\ No newline at end of file
+    name: sys-service
\ No newline at end of file
diff --git a/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 b/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2
index d6a34339..8b9b1253 100644
--- a/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2
+++ b/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
-ExecStart={{ systemctl_script_exec }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{SIZE_PERCENT_MAXIMUM_BACKUP}}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{SIZE_PERCENT_MAXIMUM_BACKUP}}
\ No newline at end of file
diff --git a/roles/sys-ctl-cln-bkps/vars/main.yml b/roles/sys-ctl-cln-bkps/vars/main.yml
index f0d032af..9b0b9999 100644
--- a/roles/sys-ctl-cln-bkps/vars/main.yml
+++ b/roles/sys-ctl-cln-bkps/vars/main.yml
@@ -1 +1 @@
-systemctl_id: "sys-ctl-cln-bkps"
+system_service_id: "sys-ctl-cln-bkps"
diff --git a/roles/sys-ctl-cln-certs/tasks/01_core.yml b/roles/sys-ctl-cln-certs/tasks/01_core.yml
index 19f1d6bc..a2ed9623 100644
--- a/roles/sys-ctl-cln-certs/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-certs/tasks/01_core.yml
@@ -12,8 +12,8 @@
     package_name: certreap
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_timer_enabled:  true
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_CLEANUP_CERTS }}"
-    systemctl_copy_files:     false
+    system_service_timer_enabled:  true
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_CLEANUP_CERTS }}"
+    system_service_copy_files:     false
diff --git a/roles/sys-ctl-cln-certs/vars/main.yml b/roles/sys-ctl-cln-certs/vars/main.yml
index 3826c2b0..4ac830af 100644
--- a/roles/sys-ctl-cln-certs/vars/main.yml
+++ b/roles/sys-ctl-cln-certs/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-cln-certs
+system_service_id: sys-ctl-cln-certs
diff --git a/roles/sys-ctl-cln-disc-space/tasks/01_core.yml b/roles/sys-ctl-cln-disc-space/tasks/01_core.yml
index 7c4fae08..aedd1991 100644
--- a/roles/sys-ctl-cln-disc-space/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-disc-space/tasks/01_core.yml
@@ -6,7 +6,7 @@
   - sys-lock
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_timer_enabled:  true
-    systemctl_on_calendar: "{{SYS_SCHEDULE_CLEANUP_DISC_SPACE}}"
\ No newline at end of file
+    system_service_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_CLEANUP_DISC_SPACE}}"
\ No newline at end of file
diff --git a/roles/sys-ctl-cln-disc-space/templates/systemctl.service.j2 b/roles/sys-ctl-cln-disc-space/templates/systemctl.service.j2
index 497e66e0..7b918a34 100644
--- a/roles/sys-ctl-cln-disc-space/templates/systemctl.service.j2
+++ b/roles/sys-ctl-cln-disc-space/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP| join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
-ExecStart={{ systemctl_script_exec }} {{ SIZE_PERCENT_CLEANUP_DISC_SPACE }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }} {{ SIZE_PERCENT_CLEANUP_DISC_SPACE }}
\ No newline at end of file
diff --git a/roles/sys-ctl-cln-disc-space/vars/main.yml b/roles/sys-ctl-cln-disc-space/vars/main.yml
index 70192cb7..2fc434c8 100644
--- a/roles/sys-ctl-cln-disc-space/vars/main.yml
+++ b/roles/sys-ctl-cln-disc-space/vars/main.yml
@@ -1 +1 @@
-systemctl_id:  "sys-ctl-cln-disc-space"
+system_service_id:  "sys-ctl-cln-disc-space"
diff --git a/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml b/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
index 8f40deed..aef13c50 100644
--- a/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
+++ b/roles/sys-ctl-cln-faild-bkps/tasks/01_core.yml
@@ -24,8 +24,8 @@
   changed_when: false
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_timer_enabled:  true
-    systemctl_on_calendar: "{{SYS_SCHEDULE_CLEANUP_FAILED_BACKUPS}}"
-    systemctl_copy_files: false
+    system_service_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_CLEANUP_FAILED_BACKUPS}}"
+    system_service_copy_files: false
diff --git a/roles/sys-ctl-cln-faild-bkps/vars/main.yml b/roles/sys-ctl-cln-faild-bkps/vars/main.yml
index 635507c3..1572a4ad 100644
--- a/roles/sys-ctl-cln-faild-bkps/vars/main.yml
+++ b/roles/sys-ctl-cln-faild-bkps/vars/main.yml
@@ -1,2 +1,2 @@
-systemctl_id: sys-ctl-cln-faild-bkps
+system_service_id: sys-ctl-cln-faild-bkps
 CLN_FAILED_DOCKER_BACKUPS_PKG: cleanup-failed-docker-backups
diff --git a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
index 433dae52..37e50a1b 100644
--- a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_ctl_alm_compose is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_HEALTH_BTRFS}}"
-    systemctl_timer_enabled:  true
\ No newline at end of file
+    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_BTRFS}}"
+    system_service_timer_enabled:  true
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-btrfs/vars/main.yml b/roles/sys-ctl-hlth-btrfs/vars/main.yml
index 4009c945..8f5492c9 100644
--- a/roles/sys-ctl-hlth-btrfs/vars/main.yml
+++ b/roles/sys-ctl-hlth-btrfs/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-btrfs
+system_service_id: sys-ctl-hlth-btrfs
diff --git a/roles/sys-ctl-hlth-csp/tasks/01_core.yml b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
index 46c52498..7bdd6764 100644
--- a/roles/sys-ctl-hlth-csp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-csp/tasks/01_core.yml
@@ -11,7 +11,7 @@
     package_notify: rebuild checkcsp docker image
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
-    systemctl_timer_enabled: true
+    system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
+    system_service_timer_enabled: true
diff --git a/roles/sys-ctl-hlth-csp/templates/systemctl.service.j2 b/roles/sys-ctl-hlth-csp/templates/systemctl.service.j2
index 870f0584..c9de1d18 100644
--- a/roles/sys-ctl-hlth-csp/templates/systemctl.service.j2
+++ b/roles/sys-ctl-hlth-csp/templates/systemctl.service.j2
@@ -4,4 +4,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} --nginx-config-dir={{ NGINX.DIRECTORIES.HTTP.SERVERS }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }} --nginx-config-dir={{ NGINX.DIRECTORIES.HTTP.SERVERS }}
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-csp/vars/main.yml b/roles/sys-ctl-hlth-csp/vars/main.yml
index 21846eee..c295cf5e 100644
--- a/roles/sys-ctl-hlth-csp/vars/main.yml
+++ b/roles/sys-ctl-hlth-csp/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-csp
\ No newline at end of file
+system_service_id: sys-ctl-hlth-csp
\ 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 3bc37de8..808a152f 100644
--- a/roles/sys-ctl-hlth-disc-space/tasks/main.yml
+++ b/roles/sys-ctl-hlth-disc-space/tasks/main.yml
@@ -7,7 +7,7 @@
   when: run_once_sys_ctl_hlth_disc_space is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-hlth-disc-space/vars/main.yml b/roles/sys-ctl-hlth-disc-space/vars/main.yml
index b549b94b..acf5b32e 100644
--- a/roles/sys-ctl-hlth-disc-space/vars/main.yml
+++ b/roles/sys-ctl-hlth-disc-space/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-disc-space
\ No newline at end of file
+system_service_id: sys-ctl-hlth-disc-space
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
index 980cd7f7..2322220c 100644
--- a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_ctl_alm_compose is not defined
   
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_timer_enabled:  true
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DOCKER_CONTAINER }}"
+    system_service_timer_enabled:  true
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DOCKER_CONTAINER }}"
diff --git a/roles/sys-ctl-hlth-docker-container/vars/main.yml b/roles/sys-ctl-hlth-docker-container/vars/main.yml
index 08a84e66..29684431 100644
--- a/roles/sys-ctl-hlth-docker-container/vars/main.yml
+++ b/roles/sys-ctl-hlth-docker-container/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-docker-container
\ No newline at end of file
+system_service_id: sys-ctl-hlth-docker-container
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
index 0cbfae01..f93de064 100644
--- a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_ctl_alm_compose is not defined
   
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_HEALTH_DOCKER_VOLUMES}}"
-    systemctl_timer_enabled: true
+    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_DOCKER_VOLUMES}}"
+    system_service_timer_enabled: true
diff --git a/roles/sys-ctl-hlth-docker-volumes/templates/systemctl.service.j2 b/roles/sys-ctl-hlth-docker-volumes/templates/systemctl.service.j2
index d8665b9c..0ae234a6 100644
--- a/roles/sys-ctl-hlth-docker-volumes/templates/systemctl.service.j2
+++ b/roles/sys-ctl-hlth-docker-volumes/templates/systemctl.service.j2
@@ -4,4 +4,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} "{{ DOCKER_WHITELISTET_ANON_VOLUMES | join(' ') }}"
+ExecStart={{ system_service_script_exec }} "{{ DOCKER_WHITELISTET_ANON_VOLUMES | join(' ') }}"
diff --git a/roles/sys-ctl-hlth-docker-volumes/vars/main.yml b/roles/sys-ctl-hlth-docker-volumes/vars/main.yml
index 7472b87c..8b74e687 100644
--- a/roles/sys-ctl-hlth-docker-volumes/vars/main.yml
+++ b/roles/sys-ctl-hlth-docker-volumes/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-docker-volumes
\ No newline at end of file
+system_service_id: sys-ctl-hlth-docker-volumes
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
index b4ebc90f..93830ad9 100644
--- a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_ctl_alm_compose is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_HEALTH_JOURNALCTL}}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_JOURNALCTL}}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-hlth-journalctl/vars/main.yml b/roles/sys-ctl-hlth-journalctl/vars/main.yml
index 47179033..965cb630 100644
--- a/roles/sys-ctl-hlth-journalctl/vars/main.yml
+++ b/roles/sys-ctl-hlth-journalctl/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-journalctl
\ No newline at end of file
+system_service_id: sys-ctl-hlth-journalctl
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml b/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
index d8fa212c..8a500d9f 100644
--- a/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_ctl_alm_telegram is not defined
   
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_MSMTP }}"
-    systemctl_timer_enabled:  true
\ No newline at end of file
+    system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_MSMTP }}"
+    system_service_timer_enabled:  true
\ No newline at end of file
diff --git a/roles/sys-ctl-hlth-msmtp/vars/main.yml b/roles/sys-ctl-hlth-msmtp/vars/main.yml
index 8df898f3..4fba5bb5 100644
--- a/roles/sys-ctl-hlth-msmtp/vars/main.yml
+++ b/roles/sys-ctl-hlth-msmtp/vars/main.yml
@@ -1,2 +1,2 @@
-systemctl_id: sys-ctl-hlth-msmtp
+system_service_id: sys-ctl-hlth-msmtp
 
diff --git a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
index a9534f3f..2bfd8545 100644
--- a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
+++ b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml
@@ -14,7 +14,7 @@
     state: present
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_HEALTH_NGINX}}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_NGINX}}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-hlth-webserver/vars/main.yml b/roles/sys-ctl-hlth-webserver/vars/main.yml
index fdc7f419..ed427174 100644
--- a/roles/sys-ctl-hlth-webserver/vars/main.yml
+++ b/roles/sys-ctl-hlth-webserver/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-hlth-webserver
\ No newline at end of file
+system_service_id: sys-ctl-hlth-webserver
\ No newline at end of file
diff --git a/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml b/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
index 6c6bc885..7259d8c3 100644
--- a/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
+++ b/roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml
@@ -4,9 +4,9 @@
   when: run_once_sys_ctl_alm_compose is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_state: restarted
-    systemctl_on_calendar:  "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_DEPLOY }}"
+    system_service_state: restarted
+    system_service_on_calendar:  "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_DEPLOY }}"
     persistent:   "true"
-    systemctl_timer_enabled:  true
\ No newline at end of file
+    system_service_timer_enabled:  true
\ No newline at end of file
diff --git a/roles/sys-ctl-mtn-cert-deploy/templates/systemctl.service.j2 b/roles/sys-ctl-mtn-cert-deploy/templates/systemctl.service.j2
index 32ddcd12..89d0b908 100644
--- a/roles/sys-ctl-mtn-cert-deploy/templates/systemctl.service.j2
+++ b/roles/sys-ctl-mtn-cert-deploy/templates/systemctl.service.j2
@@ -4,4 +4,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStart={{ systemctl_script_exec }} {{ ssl_cert_folder }} {{ docker_compose.directories.instance }} {{ LETSENCRYPT_LIVE_PATH }}
+ExecStart={{ system_service_script_exec }} {{ ssl_cert_folder }} {{ docker_compose.directories.instance }} {{ LETSENCRYPT_LIVE_PATH }}
diff --git a/roles/sys-ctl-mtn-cert-deploy/vars/main.yml b/roles/sys-ctl-mtn-cert-deploy/vars/main.yml
index d9504d24..34a1df21 100644
--- a/roles/sys-ctl-mtn-cert-deploy/vars/main.yml
+++ b/roles/sys-ctl-mtn-cert-deploy/vars/main.yml
@@ -1 +1 @@
-systemctl_id:                        "sys-ctl-mtn-cert-deploy"
+system_service_id:                        "sys-ctl-mtn-cert-deploy"
diff --git a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
index 955a3392..a42fb369 100644
--- a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
+++ b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml
@@ -13,9 +13,9 @@
     state: present
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_copy_files: false
-    systemctl_on_calendar: "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
+    system_service_copy_files: false
+    system_service_on_calendar: "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
     persistent: true
-    systemctl_timer_enabled:  true
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-mtn-cert-renew/vars/main.yml b/roles/sys-ctl-mtn-cert-renew/vars/main.yml
index 00dec87b..ae228d96 100644
--- a/roles/sys-ctl-mtn-cert-renew/vars/main.yml
+++ b/roles/sys-ctl-mtn-cert-renew/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-mtn-cert-renew
\ No newline at end of file
+system_service_id: sys-ctl-mtn-cert-renew
\ No newline at end of file
diff --git a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
index 5e39e470..b33308dc 100644
--- a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
+++ b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml
@@ -10,8 +10,8 @@
     package_name: btrfs-auto-balancer
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_copy_files: false
-    systemctl_on_calendar: "{{SYS_SCHEDULE_REPAIR_BTRFS_AUTO_BALANCER}}"
-    systemctl_timer_enabled:  true
+    system_service_copy_files: false
+    system_service_on_calendar: "{{SYS_SCHEDULE_REPAIR_BTRFS_AUTO_BALANCER}}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-rpr-btrfs-balancer/vars/main.yml b/roles/sys-ctl-rpr-btrfs-balancer/vars/main.yml
index 6b4b3cda..b51141c0 100644
--- a/roles/sys-ctl-rpr-btrfs-balancer/vars/main.yml
+++ b/roles/sys-ctl-rpr-btrfs-balancer/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-rpr-btrfs-balancer
\ No newline at end of file
+system_service_id: sys-ctl-rpr-btrfs-balancer
\ No newline at end of file
diff --git a/roles/sys-ctl-rpr-docker-hard/tasks/01_core.yml b/roles/sys-ctl-rpr-docker-hard/tasks/01_core.yml
index cd3dd87e..660b9197 100644
--- a/roles/sys-ctl-rpr-docker-hard/tasks/01_core.yml
+++ b/roles/sys-ctl-rpr-docker-hard/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_lock is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_REPAIR_DOCKER_HARD}}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_REPAIR_DOCKER_HARD}}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2 b/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2
index f9d9a0b7..3a6a0387 100644
--- a/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2
+++ b/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} {{ SYS_SERVICE_REPAIR_DOCKER_HARD }} --timeout "{{ SYS_TIMEOUT_RESTART_DOCKER }}"
-ExecStart={{ systemctl_script_exec }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }}
\ No newline at end of file
diff --git a/roles/sys-ctl-rpr-docker-hard/vars/main.yml b/roles/sys-ctl-rpr-docker-hard/vars/main.yml
index 71be303a..bcafe2c5 100644
--- a/roles/sys-ctl-rpr-docker-hard/vars/main.yml
+++ b/roles/sys-ctl-rpr-docker-hard/vars/main.yml
@@ -1,2 +1,2 @@
-systemctl_id: sys-ctl-rpr-docker-hard
+system_service_id: sys-ctl-rpr-docker-hard
 
diff --git a/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml b/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
index a42efe06..b4087e5a 100644
--- a/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
+++ b/roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml
@@ -4,7 +4,7 @@
   when: run_once_sys_lock is not defined
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_on_calendar: "{{SYS_SCHEDULE_REPAIR_DOCKER_SOFT}}"
-    systemctl_timer_enabled:  true
+    system_service_on_calendar: "{{SYS_SCHEDULE_REPAIR_DOCKER_SOFT}}"
+    system_service_timer_enabled:  true
diff --git a/roles/sys-ctl-rpr-docker-soft/templates/systemctl.service.j2 b/roles/sys-ctl-rpr-docker-soft/templates/systemctl.service.j2
index 2a6df633..83e8ef57 100644
--- a/roles/sys-ctl-rpr-docker-soft/templates/systemctl.service.j2
+++ b/roles/sys-ctl-rpr-docker-soft/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP| join(' ') }} {{ SYS_SERVICE_REPAIR_DOCKER_SOFT }} --timeout "{{ SYS_TIMEOUT_HEAL_DOCKER }}"
-ExecStart=/bin/sh -c '{{ systemctl_script_exec }} {{ PATH_DOCKER_COMPOSE_INSTANCES }}'
\ No newline at end of file
+ExecStart=/bin/sh -c '{{ system_service_script_exec }} {{ PATH_DOCKER_COMPOSE_INSTANCES }}'
\ No newline at end of file
diff --git a/roles/sys-ctl-rpr-docker-soft/vars/main.yml b/roles/sys-ctl-rpr-docker-soft/vars/main.yml
index 4d830c57..02931bf8 100644
--- a/roles/sys-ctl-rpr-docker-soft/vars/main.yml
+++ b/roles/sys-ctl-rpr-docker-soft/vars/main.yml
@@ -1 +1 @@
-systemctl_id: sys-ctl-rpr-docker-soft
\ No newline at end of file
+system_service_id: sys-ctl-rpr-docker-soft
\ No newline at end of file
diff --git a/roles/sys-daemon/README.md b/roles/sys-daemon/README.md
index cfb1c453..45c73b17 100644
--- a/roles/sys-daemon/README.md
+++ b/roles/sys-daemon/README.md
@@ -1,44 +1,26 @@
-# Core Daemon Reset
+# sys-daemon
 
 ## Description
 
-This role resets and cleans up all **Infinito.Nexus** core daemon `systemd` service units that match the configured suffix (`SYS_SERVICE_SUFFIX`).  
-It is primarily used in maintenance or reset scenarios when a full service cleanup is required.
+Role to reset and configure the **systemd manager** for Infinito.Nexus.  
+It ensures a clean state of the manager configuration and applies default timeout values.
 
 ## Overview
 
-When the `MODE_RESET` flag is enabled, the role will:
-
-1. **Run Once Per Play:** Guarded by `run_once_sys_daemon` to avoid duplicate execution.
-2. **Identify Service Units:** Finds all `/etc/systemd/system/*{{ SYS_SERVICE_SUFFIX }}` units.
-3. **Stop and Disable Services:** Gracefully stops and disables matching services.
-4. **Remove Unit Files:** Deletes the corresponding unit files from the system.
-5. **Reload systemd:** Ensures the service manager state is updated after cleanup.
-
-## Purpose
-
-The main goal of this role is to ensure a clean and consistent state for core daemon services by removing obsolete or stale systemd units.  
-This is particularly useful when re-deploying or performing a full environment reset.
+- Purges the systemd manager drop-in directory if requested.  
+- Validates all active unit files before reload/reexec.  
+- Applies default timeout values for systemd manager behavior.  
+- Provides handler-based reload/reexec for systemd.  
 
 ## Features
 
-- **Automated Cleanup:** Stops, disables, and removes targeted systemd units.
-- **Idempotent Execution:** Runs only once per playbook run.
-- **Configurable Targeting:** Matches services using `SYS_SERVICE_SUFFIX`.
-- **Systemd Integration:** Reloads daemon state after changes.
+- **Drop-in Purge:** Optionally remove `/etc/systemd/system.conf.d` contents.  
+- **Manager Defaults:** Deploys custom timeouts via `timeouts.conf`.  
+- **Validation:** Uses `systemd-analyze verify` before reload.  
+- **Integration:** Triggers `daemon-reload` or `daemon-reexec` safely.  
 
 ## Further Resources
 
-- [systemd Service Management](https://www.freedesktop.org/software/systemd/man/systemctl.html)
-- [Infinito.Nexus License](https://s.infinito.nexus/license)
-
-## License
-
-This role is released under the Infinito.Nexus NonCommercial License.
-See [license details](https://s.infinito.nexus/license)
-
-## Author Information
-
-Kevin Veen-Birkenbach
-Consulting & Coaching Solutions
-[https://www.veen.world](https://www.veen.world)
\ No newline at end of file
+- [systemd - Manager Configuration](https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html)  
+- [systemd-analyze](https://www.freedesktop.org/software/systemd/man/systemd-analyze.html)  
+- [systemctl](https://www.freedesktop.org/software/systemd/man/systemctl.html)
diff --git a/roles/sys-daemon/defaults/main.yml b/roles/sys-daemon/defaults/main.yml
new file mode 100644
index 00000000..bb5bed7b
--- /dev/null
+++ b/roles/sys-daemon/defaults/main.yml
@@ -0,0 +1,8 @@
+# General
+SYSTEMD_MANAGER_CONF_DIR:       "/etc/systemd/system.conf.d"
+
+# Defaults
+SYSTEMD_DEFAULT_TIMEOUT_START:  "90s"      # Maximum time a service is allowed to reach the 'active' state during startup
+SYSTEMD_DEFAULT_TIMEOUT_STOP:   "90s"      # Maximum time a service is allowed to stop gracefully before being killed
+SYSTEMD_DEFAULT_TIMEOUT_ABORT:  "90s"      # Additional grace period after Stop timeout before systemd sends SIGKILL
+
diff --git a/roles/sys-daemon/handlers/main.yml b/roles/sys-daemon/handlers/main.yml
index a7bbe965..bd9eac52 100644
--- a/roles/sys-daemon/handlers/main.yml
+++ b/roles/sys-daemon/handlers/main.yml
@@ -1,4 +1,49 @@
-- name: "reload system daemon"
+- name: collect systemd unit files
+  shell: |
+    shopt -s nullglob
+    files=({{ PATH_SYSTEM_SERVICE_DIR }}*.service {{ PATH_SYSTEM_SERVICE_DIR }}*.timer)
+    printf "%s\n" "${files[@]}"
+  args:
+    executable: /bin/bash
+  register: _unit_files
+  changed_when: false
+  failed_when: false
+  become: true
+  listen:
+    - reload system daemon
+    - reexec systemd manager
+
+- name: validate systemd units
+  shell: |
+    systemd-analyze verify {{ _unit_files.stdout_lines | join(' ') }}
+  register: _verify_units
+  changed_when: false
+  failed_when: _unit_files.stdout | length > 0 and _verify_units.rc != 0
+  become: true
+  when: _unit_files.stdout | length > 0
+  listen:
+    - reload system daemon
+    - reexec systemd manager
+
+- name: show merged manager config
+  command: systemd-analyze cat-config systemd/system.conf
+  register: _catcfg
+  changed_when: false
+  become: true
+  listen:
+    - reload system daemon
+    - reexec systemd manager
+
+- name: reload system daemon
   command: systemctl daemon-reload
+  become: true
+  listen: reload system daemon
   async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
-  poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
\ No newline at end of file
+  poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
+
+- name: reexec systemd manager
+  command: systemctl daemon-reexec
+  become: true
+  listen: reexec systemd manager
+  async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
+  poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
diff --git a/roles/sys-daemon/meta/main.yml b/roles/sys-daemon/meta/main.yml
index c7565b35..7662b91a 100644
--- a/roles/sys-daemon/meta/main.yml
+++ b/roles/sys-daemon/meta/main.yml
@@ -1,19 +1,19 @@
+---
 galaxy_info:
   author: "Kevin Veen-Birkenbach"
-  description: "Role to reset and clean up Infinito.Nexus systemd service units for the core daemon."
-  company: |
+  description: "Role to reset and configure the systemd manager (drop-ins, defaults, validation)."
+  license: "Infinito.Nexus NonCommercial License"
+  license_url: "https://s.infinito.nexus/license"
+  company: | 
     Kevin Veen-Birkenbach
     Consulting & Coaching Solutions
     https://www.veen.world
-  license: "Infinito.Nexus NonCommercial License"
-  license_url: "https://s.infinito.nexus/license"
-  min_ansible_version: "2.9"
   galaxy_tags:
     - systemd
-    - cleanup
     - infinito
+    - daemon
+    - cleanup
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://s.infinito.nexus/code/#sys-daemon-role"
-
+  documentation: "https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html"
 dependencies: []
diff --git a/roles/sys-daemon/tasks/01_reset.yml b/roles/sys-daemon/tasks/01_reset.yml
new file mode 100644
index 00000000..3b973d5a
--- /dev/null
+++ b/roles/sys-daemon/tasks/01_reset.yml
@@ -0,0 +1,16 @@
+- name: reload system daemon
+  command: /bin/true
+  notify: "reload system daemon"
+
+- name: "Sanity check SYSTEMD_MANAGER_CONF_DIR"
+  assert:
+    that:
+      - SYSTEMD_MANAGER_CONF_DIR | regex_search('^/etc/systemd/system\.conf\.d/?$')
+    fail_msg: "SYSTEMD_MANAGER_CONF_DIR must be /etc/systemd/system.conf.d"
+  when: SYSTEMD_MANAGER_RESET_PURGE | bool
+
+- name: "Purge manager drop-in directory (remove)"
+  file:
+    path: "{{ SYSTEMD_MANAGER_CONF_DIR }}"
+    state: absent
+  notify: reexec systemd manager
\ No newline at end of file
diff --git a/roles/sys-daemon/tasks/02_defaults.yml b/roles/sys-daemon/tasks/02_defaults.yml
new file mode 100644
index 00000000..7fb41997
--- /dev/null
+++ b/roles/sys-daemon/tasks/02_defaults.yml
@@ -0,0 +1,12 @@
+- name: "Ensure {{ SYSTEMD_MANAGER_CONF_DIR }} exists"
+  file:
+    path: "{{ SYSTEMD_MANAGER_CONF_DIR }}"
+    state: directory
+    mode: "0755"
+
+- name: Deploy systemd manager default timeout settings
+  template:
+    src:  timeouts.conf.j2
+    dest: "{{ SYSTEMD_MANAGER_CONF_DIR }}/timeouts.conf"
+    mode: "0644"
+  notify: reexec systemd manager
diff --git a/roles/sys-daemon/tasks/main.yml b/roles/sys-daemon/tasks/main.yml
index 4002f657..9a0f9530 100644
--- a/roles/sys-daemon/tasks/main.yml
+++ b/roles/sys-daemon/tasks/main.yml
@@ -1,8 +1,8 @@
-- name: "reset (if enabled)"
-  include_tasks: reset.yml 
-  when: MODE_RESET | bool and run_once_sys_daemon is not defined
-
-- name: run {{ role_name }} once
-  set_fact:
-    run_once_sys_daemon: true
+- block:
+  - name: "reset (if enabled)"
+    include_tasks: 01_reset.yml
+    when: MODE_RESET | bool and run_once_sys_daemon is not defined
+  - name: Apply systemd manager defaults
+    include_tasks: 02_defaults.yml
+  - include_tasks: utils/run_once.yml
   when: run_once_sys_daemon is not defined
\ No newline at end of file
diff --git a/roles/sys-daemon/tasks/reset.yml b/roles/sys-daemon/tasks/reset.yml
deleted file mode 100644
index e28dcdca..00000000
--- a/roles/sys-daemon/tasks/reset.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-- name: reload system daemon
-  command: /bin/true
-  notify: "reload system daemon"
diff --git a/roles/sys-daemon/templates/timeouts.conf.j2 b/roles/sys-daemon/templates/timeouts.conf.j2
new file mode 100644
index 00000000..40e1bc49
--- /dev/null
+++ b/roles/sys-daemon/templates/timeouts.conf.j2
@@ -0,0 +1,4 @@
+[Manager]
+DefaultTimeoutStartSec={{ SYSTEMD_DEFAULT_TIMEOUT_START }}
+DefaultTimeoutStopSec={{ SYSTEMD_DEFAULT_TIMEOUT_STOP }}
+DefaultTimeoutAbortSec={{ SYSTEMD_DEFAULT_TIMEOUT_ABORT }}
diff --git a/roles/sys-service/README.md b/roles/sys-service/README.md
new file mode 100644
index 00000000..cde8d8a7
--- /dev/null
+++ b/roles/sys-service/README.md
@@ -0,0 +1,27 @@
+# sys-service
+
+## Description
+
+Role to manage **systemd service units** for Infinito.Nexus software stacks.  
+It installs or removes unit files, configures runtime behavior, and ensures services are properly deployed.
+
+## Overview
+
+- Resets service units by removing old or obsolete definitions.  
+- Deploys new service unit files and service scripts.  
+- Optionally sets up timers linked to the services.  
+- Ensures correct reload/restart behavior across the stack.  
+
+## Features
+
+- **Unit Cleanup:** Automated removal of old service units.  
+- **Custom Templates:** Supports both `systemctl.service.j2` and `systemctl@.service.j2`.  
+- **Timers:** Integrates with `sys-timer` for scheduled execution.  
+- **Runtime Limits:** Configurable `RuntimeMaxSec` per service.  
+- **Handlers:** Automatic reload/restart of services when definitions change.  
+
+## Further Resources
+
+- [systemd - Service Units](https://www.freedesktop.org/software/systemd/man/systemd.service.html)  
+- [systemd - Timer Units](https://www.freedesktop.org/software/systemd/man/systemd.timer.html)  
+- [systemctl](https://www.freedesktop.org/software/systemd/man/systemctl.html)
diff --git a/roles/sys-service/defaults/main.yml b/roles/sys-service/defaults/main.yml
new file mode 100644
index 00000000..2124471f
--- /dev/null
+++ b/roles/sys-service/defaults/main.yml
@@ -0,0 +1,3 @@
+SYS_SERVICE_ALL_ENABLED:      "{{ not MODE_DEBUG }}"
+SYS_SERVICE_DEFAULT_STATE:    "{{ 'restarted' if MODE_DEBUG else omit }}"
+SYS_SERVICE_DEFAULT_RUNTIME:  "86400s"    # Maximum total runtime a service is allowed to run before being stopped
\ No newline at end of file
diff --git a/roles/sys-systemctl/filter_plugins/filetype.py b/roles/sys-service/filter_plugins/filetype.py
similarity index 100%
rename from roles/sys-systemctl/filter_plugins/filetype.py
rename to roles/sys-service/filter_plugins/filetype.py
diff --git a/roles/sys-systemctl/handlers/main.yml b/roles/sys-service/handlers/main.yml
similarity index 65%
rename from roles/sys-systemctl/handlers/main.yml
rename to roles/sys-service/handlers/main.yml
index b5d0aeb3..d9cdadb8 100644
--- a/roles/sys-systemctl/handlers/main.yml
+++ b/roles/sys-service/handlers/main.yml
@@ -1,8 +1,8 @@
 - name: "refresh systemctl service"
   systemd:
-    name: "{{ systemctl_id | get_service_name(SOFTWARE_NAME) }}"
+    name: "{{ system_service_id | get_service_name(SOFTWARE_NAME) }}"
     daemon_reload: yes
     enabled: yes
-    state: "{{ systemctl_state }}"
+    state: "{{ system_service_state }}"
   async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
   poll:  "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
diff --git a/roles/sys-systemctl/meta/main.yml b/roles/sys-service/meta/main.yml
similarity index 66%
rename from roles/sys-systemctl/meta/main.yml
rename to roles/sys-service/meta/main.yml
index fc7b74e5..e9799cb8 100644
--- a/roles/sys-systemctl/meta/main.yml
+++ b/roles/sys-service/meta/main.yml
@@ -1,10 +1,10 @@
 ---
 galaxy_info:
   author: "Kevin Veen-Birkenbach"
-  description: "Utility role to reset/clean up systemd units for a given software stack."
+  description: "Role to manage systemd service units, including cleanup, deployment, and runtime configuration."
   license: "Infinito.Nexus NonCommercial License"
   license_url: "https://s.infinito.nexus/license"
-  company: |
+  company: | 
     Kevin Veen-Birkenbach
     Consulting & Coaching Solutions
     https://www.veen.world
@@ -16,9 +16,9 @@ galaxy_info:
   galaxy_tags:
     - systemd
     - services
-    - cleanup
-    - reset
     - automation
+    - infinito
   repository: "https://s.infinito.nexus/code"
   issue_tracker_url: "https://s.infinito.nexus/issues"
-  documentation: "https://docs.infinito.nexus"
+  documentation: "https://www.freedesktop.org/software/systemd/man/systemd.service.html"
+dependencies: []
diff --git a/roles/sys-systemctl/tasks/01_core.yml b/roles/sys-service/tasks/01_core.yml
similarity index 100%
rename from roles/sys-systemctl/tasks/01_core.yml
rename to roles/sys-service/tasks/01_core.yml
diff --git a/roles/sys-systemctl/tasks/02_reset.yml b/roles/sys-service/tasks/02_reset.yml
similarity index 100%
rename from roles/sys-systemctl/tasks/02_reset.yml
rename to roles/sys-service/tasks/02_reset.yml
diff --git a/roles/sys-systemctl/tasks/03_base.yml b/roles/sys-service/tasks/03_base.yml
similarity index 51%
rename from roles/sys-systemctl/tasks/03_base.yml
rename to roles/sys-service/tasks/03_base.yml
index ee537eaa..6f7ca91b 100644
--- a/roles/sys-systemctl/tasks/03_base.yml
+++ b/roles/sys-service/tasks/03_base.yml
@@ -1,7 +1,6 @@
-# roles/sys-systemctl/tasks/03_base.yml
 - name: "find best matching source for service script"
   set_fact:
-    systemctl_script_src: >-
+    system_service_script_src: >-
       {{ lookup('first_found',
         {
           'files': [
@@ -10,21 +9,21 @@
             'files/script.sh',
             'files/script.py'
           ],
-          'paths': [ systemctl_role_dir ]
+          'paths': [ system_service_role_dir ]
         },
         errors='strict'
       ) }}
-  when: systemctl_copy_files | bool
+  when: system_service_copy_files | bool
 
-- name: "Load file logic for '{{ systemctl_id }}'"
+- name: "Load file logic for '{{ system_service_id }}'"
   include_tasks: 04_files.yml
   when:
-    - systemctl_copy_files | bool
-    - systemctl_script_src
+    - system_service_copy_files | bool
+    - system_service_script_src
 
-- name: "Load systemctl logic for '{{ systemctl_id }}'"
+- name: "Load systemctl logic for '{{ system_service_id }}'"
   include_tasks: 05_service.yml
 
-- name: "Load timer logic for '{{ systemctl_id }}'"
+- name: "Load timer logic for '{{ system_service_id }}'"
   include_tasks: 06_timer.yml
-  when: systemctl_timer_enabled | bool
\ No newline at end of file
+  when: system_service_timer_enabled | bool
\ No newline at end of file
diff --git a/roles/sys-service/tasks/04_files.yml b/roles/sys-service/tasks/04_files.yml
new file mode 100644
index 00000000..24cec1fc
--- /dev/null
+++ b/roles/sys-service/tasks/04_files.yml
@@ -0,0 +1,23 @@
+
+- name: "create {{ system_service_script_dir }}"
+  file:
+    path: "{{ system_service_script_dir }}"
+    state: directory
+    mode: "0755"
+
+- name: "template or copy script"
+  block:
+    - name: "render template"
+      template:
+        src:  "{{ system_service_script_src }}"
+        dest: "{{ [system_service_script_dir, (system_service_script_src | basename | regex_replace('\\.j2$', ''))] | path_join }}"
+        mode: "0755"
+      when: system_service_script_src.endswith('.j2')
+
+    - name: "copy raw file"
+      copy:
+        src:  "{{ system_service_script_src }}"
+        dest: "{{ [system_service_script_dir, (system_service_script_src | basename)] | path_join }}"
+        mode: "0755"
+      when: not system_service_script_src.endswith('.j2')
+  when: system_service_copy_files | bool
diff --git a/roles/sys-systemctl/tasks/05_service.yml b/roles/sys-service/tasks/05_service.yml
similarity index 60%
rename from roles/sys-systemctl/tasks/05_service.yml
rename to roles/sys-service/tasks/05_service.yml
index a8658c53..6055e7fb 100644
--- a/roles/sys-systemctl/tasks/05_service.yml
+++ b/roles/sys-service/tasks/05_service.yml
@@ -1,7 +1,7 @@
 # 1) Find the template (prefer target role, then fall back to this role)
 - name: Resolve systemctl template source
   set_fact:
-    systemctl_template_src: >-
+    system_service_template_src: >-
       {{ lookup(
            'first_found',
            {
@@ -10,7 +10,7 @@
                'templates/systemctl.service.j2'
              ],
              'paths': [
-               systemctl_role_dir,
+               system_service_role_dir,
                role_path
              ]
            },
@@ -20,22 +20,22 @@
 # Optional: sanity check with a clear error if truly nothing found
 - name: Ensure a systemctl template was found
   assert:
-    that: systemctl_template_src | length > 0
+    that: system_service_template_src | length > 0
     fail_msg: >-
       Could not resolve any systemctl template. Looked in:
-      {{ systemctl_role_dir }}/templates/ and {{ role_path }}/templates/.
+      {{ system_service_role_dir }}/templates/ and {{ role_path }}/templates/.
 
 # 2) Now we may safely derive whether it’s the “@” variant
 - name: Flag whether @-template is used
   set_fact:
-    systemctl_uses_at: "{{ (systemctl_template_src | basename) is search('@\\.service\\.j2$') }}"
+    system_service_uses_at: "{{ (system_service_template_src | basename) is search('@\\.service\\.j2$') }}"
 
 # 3) Use it
-- name: "setup systemctl '{{ systemctl_id }}'"
+- name: "setup systemctl '{{ system_service_id }}'"
   template:
-    src:  "{{ systemctl_template_src }}"
-    dest: "{{ [ PATH_SYSTEM_SERVICE_DIR, systemctl_id | get_service_name(SOFTWARE_NAME) ] | path_join }}"
-  notify: "{{ 'reload system daemon' if systemctl_uses_at else 'refresh systemctl service' }}"
+    src:  "{{ system_service_template_src }}"
+    dest: "{{ [ PATH_SYSTEM_SERVICE_DIR, system_service_id | get_service_name(SOFTWARE_NAME) ] | path_join }}"
+  notify: "{{ 'reload system daemon' if system_service_uses_at else 'refresh systemctl service' }}"
 
 - name:   refresh systemctl service when SYS_SERVICE_ALL_ENABLED
   command: /bin/true
@@ -44,4 +44,4 @@
     - refresh systemctl service
   when: 
     - SYS_SERVICE_ALL_ENABLED | bool
-    - not systemctl_uses_at
+    - not system_service_uses_at
diff --git a/roles/sys-service/tasks/06_timer.yml b/roles/sys-service/tasks/06_timer.yml
new file mode 100644
index 00000000..97cfffda
--- /dev/null
+++ b/roles/sys-service/tasks/06_timer.yml
@@ -0,0 +1,13 @@
+- name: Fail if system_service_id contains "@"
+  assert:
+    that:
+      - "'@' not in system_service_id"
+    fail_msg: "Invalid system_service_id '{{ system_service_id }}' → must not contain '@'."
+
+- name: "Make '{{ system_service_id }}' available for sys-timer"
+  set_fact:
+    system_service_timer_service: "{{ system_service_id }}"
+
+- name: "include role for sys-timer for {{ system_service_timer_service }}"
+  include_role:
+    name: sys-timer
\ No newline at end of file
diff --git a/roles/sys-systemctl/tasks/main.yml b/roles/sys-service/tasks/main.yml
similarity index 50%
rename from roles/sys-systemctl/tasks/main.yml
rename to roles/sys-service/tasks/main.yml
index 8a2b3a0e..805b65ac 100644
--- a/roles/sys-systemctl/tasks/main.yml
+++ b/roles/sys-service/tasks/main.yml
@@ -1,14 +1,14 @@
 - block:
   - include_tasks: 01_core.yml
   - include_tasks: utils/run_once.yml
-  when: run_once_sys_systemctl is not defined
+  when: run_once_sys_service is not defined
 
-- name: "Execute service routines for '{{ systemctl_id }}'"
+- name: "Execute service routines for '{{ system_service_id }}'"
   block:
-  - name: "Load base routine for '{{ systemctl_id }}'"
+  - name: "Load base routine for '{{ system_service_id }}'"
     include_tasks: 03_base.yml
   - include_tasks: utils/run_once.yml
     vars:
-      # Necessary to flush after every service which uses an 'systemctl_id' otherwise wrong one will be used
+      # Necessary to flush after every service which uses an 'system_service_id' otherwise wrong one will be used
       flush_handlers: true
-  when: systemctl_id is defined
\ No newline at end of file
+  when: system_service_id is defined
\ No newline at end of file
diff --git a/roles/sys-service/templates/systemctl.service.j2 b/roles/sys-service/templates/systemctl.service.j2
new file mode 100644
index 00000000..8accf283
--- /dev/null
+++ b/roles/sys-service/templates/systemctl.service.j2
@@ -0,0 +1,10 @@
+[Unit]
+Description={{ SOFTWARE_NAME }} - Service for role '{{ system_service_id }}'
+OnFailure={{ system_service_tpl_on_failure }}
+
+[Service]
+Type={{ system_service_tpl_type }}
+ExecStart={{ system_service_tpl_exec_start }}
+{% if system_service_tpl_runtime |length > 0 %}
+RuntimeMaxSec={{ system_service_tpl_runtime }}
+{% endif %}
diff --git a/roles/sys-service/vars/main.yml b/roles/sys-service/vars/main.yml
new file mode 100644
index 00000000..5909e887
--- /dev/null
+++ b/roles/sys-service/vars/main.yml
@@ -0,0 +1,23 @@
+UNIT_SUFFIX_REMOVER_PACKAGE:  "unsure"
+
+## Paths
+system_service_role_name:      "{{ system_service_id | regex_replace('@','') }}"
+system_service_role_dir:       "{{ [ playbook_dir, 'roles', system_service_role_name ] | path_join }}"
+system_service_script_dir:     "{{ [ PATH_SYSTEMCTL_SCRIPTS, system_service_id ] | path_join }}"
+
+## Settings
+system_service_copy_files:     true  # When set to false file copying will be skipped
+system_service_timer_enabled:  false # When set to true timer will be loaded
+system_service_state:          "{{ SYS_SERVICE_DEFAULT_STATE }}"
+
+# Dynamic Loaded ( Just available when dependencies are loaded )
+system_service_script_base:    "{{ system_service_script_src | basename | regex_replace('\\.j2$', '') }}"
+system_service_script_type:    "{{ system_service_script_base | filetype }}"
+system_service_script_inter:   "/bin/{{ 'bash' if system_service_script_type == 'sh' else 'python3'}}"
+system_service_script_exec:    "{{ system_service_script_inter }} {{ system_service_id | get_service_script_path( system_service_script_type ) }}"
+
+# Service template
+system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
+system_service_tpl_type:       "oneshot"
+system_service_tpl_exec_start: "{{ system_service_script_exec }}"
+system_service_tpl_runtime:    "{{ SYS_SERVICE_DEFAULT_RUNTIME }}"
\ No newline at end of file
diff --git a/roles/sys-systemctl/README.md b/roles/sys-systemctl/README.md
deleted file mode 100644
index 7a43187f..00000000
--- a/roles/sys-systemctl/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# sys-systemctl
-
-Utility role to reset/clean up **systemd** units for a given software stack.  
-It can install a unit-file remover tool, delete units that match a configured suffix, and reload the systemd daemon. The role is designed to run **once per play** and is commonly included by other roles (e.g., timer/service roles) to ensure a clean state before (re)deployment.
-
-## Overview
-
-When `MODE_RESET` is enabled, the role will:
-
-1. Install the configured remover tool/package (via `pkgmgr-install`).
-2. Remove all unit files that match the configured suffix for the current software.
-3. Reload the systemd daemon to apply changes.
-
-A run-once guard (`run_once_sys_systemctl`) prevents repeated execution within the same play run.
-
-## Features
-
-- **Idempotent cleanup** of systemd unit files based on a suffix.
-- **Pluggable remover tool** via `UNIT_SUFFIX_REMOVER_PACKAGE`.
-- **Daemon reload** to immediately apply changes.
-- **Run-once safety** across the play to avoid redundant work.
-
-## Variables
-
-| Variable                     | Type    | Default     | Description                                                                                 |
-|-----------------------------|---------|-------------|---------------------------------------------------------------------------------------------|
-| `MODE_RESET`                | bool    | `false`     | If `true`, executes the reset/cleanup tasks.                                                |
-| `SYS_SERVICE_SUFFIX`        | string  | *required*  | Suffix used to identify unit files belonging to the software stack (e.g., `.infinito.nexus`). |
-| `SOFTWARE_NAME`             | string  | *required*  | Logical software identifier passed to the remover tool.                                      |
-| `UNIT_SUFFIX_REMOVER_PACKAGE` | string| `"unsure"`  | Package/command used to remove the unit files. Must provide a CLI compatible with `-s`.     |
-
-> **Note:** The role expects the remover tool to support a command pattern like:
-> ```
-> <UNIT_SUFFIX_REMOVER_PACKAGE> -s '<SOFTWARE_NAME>'
-> ```
-> Replace `UNIT_SUFFIX_REMOVER_PACKAGE` with your actual utility (or wrapper script) that removes all matching unit files.
-
-## Tasks Flow
-
-- `tasks/main.yml`
-  - Includes `tasks/01_reset.yml` **only when** `MODE_RESET` is `true`.
-  - Loads `utils/run_once.yml` once to set `run_once_sys_systemctl`.
-
-- `tasks/01_reset.yml`
-  - Installs `UNIT_SUFFIX_REMOVER_PACKAGE` via `pkgmgr-install`.
-  - Executes the remover command to purge unit files for `SOFTWARE_NAME` / `SYS_SERVICE_SUFFIX`.
-  - Runs `systemctl daemon-reload`.
-
-## Dependencies
-
-- `pkgmgr-install` (role): used to install `UNIT_SUFFIX_REMOVER_PACKAGE`.
-
diff --git a/roles/sys-systemctl/tasks/04_files.yml b/roles/sys-systemctl/tasks/04_files.yml
deleted file mode 100644
index 47c6f372..00000000
--- a/roles/sys-systemctl/tasks/04_files.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-- name: "create {{ systemctl_script_dir }}"
-  file:
-    path: "{{ systemctl_script_dir }}"
-    state: directory
-    mode: "0755"
-
-- name: "template or copy script"
-  block:
-    - name: "render template"
-      template:
-        src:  "{{ systemctl_script_src }}"
-        dest: "{{ [systemctl_script_dir, (systemctl_script_src | basename | regex_replace('\\.j2$', ''))] | path_join }}"
-        mode: "0755"
-      when: systemctl_script_src.endswith('.j2')
-
-    - name: "copy raw file"
-      copy:
-        src:  "{{ systemctl_script_src }}"
-        dest: "{{ [systemctl_script_dir, (systemctl_script_src | basename)] | path_join }}"
-        mode: "0755"
-      when: not systemctl_script_src.endswith('.j2')
-  when: systemctl_copy_files | bool
diff --git a/roles/sys-systemctl/tasks/06_timer.yml b/roles/sys-systemctl/tasks/06_timer.yml
deleted file mode 100644
index dda5a5fa..00000000
--- a/roles/sys-systemctl/tasks/06_timer.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- name: Fail if systemctl_id contains "@"
-  assert:
-    that:
-      - "'@' not in systemctl_id"
-    fail_msg: "Invalid systemctl_id '{{ systemctl_id }}' → must not contain '@'."
-
-- name: "Make '{{ systemctl_id }}' available for sys-timer"
-  set_fact:
-    systemctl_timer_service: "{{ systemctl_id }}"
-
-- name: "include role for sys-timer for {{ systemctl_timer_service }}"
-  include_role:
-    name: sys-timer
\ No newline at end of file
diff --git a/roles/sys-systemctl/templates/systemctl.service.j2 b/roles/sys-systemctl/templates/systemctl.service.j2
deleted file mode 100644
index 191cc794..00000000
--- a/roles/sys-systemctl/templates/systemctl.service.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description={{ SOFTWARE_NAME }} - Service for role '{{ systemctl_id }}'
-OnFailure={{ systemctl_tpl_on_failure }}
-
-[Service]
-Type={{ systemctl_tpl_type }}
-ExecStart={{ systemctl_tpl_exec_start }}
diff --git a/roles/sys-systemctl/vars/main.yml b/roles/sys-systemctl/vars/main.yml
deleted file mode 100644
index 99257b4f..00000000
--- a/roles/sys-systemctl/vars/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-UNIT_SUFFIX_REMOVER_PACKAGE:  "unsure"
-
-## Paths
-systemctl_role_name:      "{{ systemctl_id | regex_replace('@','') }}"
-systemctl_role_dir:       "{{ [ playbook_dir, 'roles', systemctl_role_name ] | path_join }}"
-systemctl_script_dir:     "{{ [ PATH_SYSTEMCTL_SCRIPTS, systemctl_id ] | path_join }}"
-
-## Settings
-systemctl_copy_files:     true  # When set to false file copying will be skipped
-systemctl_timer_enabled:  false # When set to true timer will be loaded
-systemctl_state:          "{{ SYS_SERVICE_DEFAULT_STATE }}"
-
-# Dynamic Loaded ( Just available when dependencies are loaded )
-systemctl_script_base:    "{{ systemctl_script_src | basename | regex_replace('\\.j2$', '') }}"
-systemctl_script_type:    "{{ systemctl_script_base | filetype }}"
-systemctl_script_inter:   "/bin/{{ 'bash' if systemctl_script_type == 'sh' else 'python3'}}"
-systemctl_script_exec:    "{{ systemctl_script_inter }} {{ systemctl_id | get_service_script_path( systemctl_script_type ) }}"
-
-# Service template
-systemctl_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
-systemctl_tpl_type:       "oneshot"
-systemctl_tpl_exec_start: "{{ systemctl_script_exec }}"
\ No newline at end of file
diff --git a/roles/sys-timer-cln-bkps/tasks/01_core.yml b/roles/sys-timer-cln-bkps/tasks/01_core.yml
index 10a38a25..111b02fa 100644
--- a/roles/sys-timer-cln-bkps/tasks/01_core.yml
+++ b/roles/sys-timer-cln-bkps/tasks/01_core.yml
@@ -6,12 +6,12 @@
   vars:
     flush_handlers: true
 
-- name: set systemctl_timer_service to sys-ctl-cln-bkps
+- name: set system_service_timer_service to sys-ctl-cln-bkps
   set_fact:
-    systemctl_timer_service: "sys-ctl-cln-bkps"
+    system_service_timer_service: "sys-ctl-cln-bkps"
 
-- name: "include role for sys-timer for {{ systemctl_timer_service }}"
+- name: "include role for sys-timer for {{ system_service_timer_service }}"
   include_role:
     name: sys-timer
   vars:
-    systemctl_on_calendar: "{{ SYS_SCHEDULE_CLEANUP_BACKUPS }}"
+    system_service_on_calendar: "{{ SYS_SCHEDULE_CLEANUP_BACKUPS }}"
diff --git a/roles/sys-timer/README.md b/roles/sys-timer/README.md
index e599afa0..21ea5ad5 100644
--- a/roles/sys-timer/README.md
+++ b/roles/sys-timer/README.md
@@ -7,9 +7,9 @@ This role configures a systemd timer to periodically start a corresponding servi
 ## Overview
 
 Optimized for automated task scheduling in a [systemd](https://en.wikipedia.org/wiki/Systemd) environment, this role:
-- Generates a timer unit file for a given service (using the `systemctl_timer_service` variable).
+- Generates a timer unit file for a given service (using the `system_service_timer_service` variable).
 - Reloads and restarts the timer using systemd to ensure that changes take effect.
-- Supports dynamic configuration of scheduling parameters via variables like `systemctl_on_calendar` and `RANDOMIZED_DELAY_SEC`.
+- Supports dynamic configuration of scheduling parameters via variables like `system_service_on_calendar` and `RANDOMIZED_DELAY_SEC`.
 
 ## Purpose
 
diff --git a/roles/sys-timer/templates/dummy.timer.j2 b/roles/sys-timer/templates/dummy.timer.j2
index 7316feb3..69c40a33 100644
--- a/roles/sys-timer/templates/dummy.timer.j2
+++ b/roles/sys-timer/templates/dummy.timer.j2
@@ -1,8 +1,8 @@
 [Unit]
-Description=Timer to start {{ systemctl_timer_service }}{{ SYS_SERVICE_SUFFIX }}
+Description=Timer to start {{ system_service_timer_service }}{{ SYS_SERVICE_SUFFIX }}
 
 [Timer]
-OnCalendar={{ systemctl_on_calendar }}
+OnCalendar={{ system_service_on_calendar }}
 RandomizedDelaySec={{ RANDOMIZED_DELAY_SEC }}
 Persistent={{ persistent | default('false') }}
 
diff --git a/roles/sys-timer/vars/main.yml b/roles/sys-timer/vars/main.yml
index dadef1c4..bacffa4b 100644
--- a/roles/sys-timer/vars/main.yml
+++ b/roles/sys-timer/vars/main.yml
@@ -1 +1 @@
-sys_timer_file: "{{ systemctl_timer_service }}{{ SYS_TIMER_SUFFIX }}"
\ No newline at end of file
+sys_timer_file: "{{ system_service_timer_service }}{{ SYS_TIMER_SUFFIX }}"
\ No newline at end of file
diff --git a/roles/update-docker/tasks/01_core.yml b/roles/update-docker/tasks/01_core.yml
index e9164a7c..c816db5c 100644
--- a/roles/update-docker/tasks/01_core.yml
+++ b/roles/update-docker/tasks/01_core.yml
@@ -11,6 +11,6 @@
   - MODE_BACKUP | bool
 
 - include_role:
-    name: sys-systemctl
+    name: sys-service
   vars:
-    systemctl_restarted: true
+    system_service_restarted: true
diff --git a/roles/update-docker/templates/systemctl.service.j2 b/roles/update-docker/templates/systemctl.service.j2
index 7423a204..e999610a 100644
--- a/roles/update-docker/templates/systemctl.service.j2
+++ b/roles/update-docker/templates/systemctl.service.j2
@@ -5,4 +5,4 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} {{ 'update-docker' | get_service_name(SOFTWARE_NAME) }} --timeout "{{ SYS_TIMEOUT_HEAL_DOCKER }}"
-ExecStart={{ systemctl_script_exec }}
\ No newline at end of file
+ExecStart={{ system_service_script_exec }}
\ No newline at end of file
diff --git a/roles/update-docker/vars/main.yml b/roles/update-docker/vars/main.yml
index 129aa889..a630b7bb 100644
--- a/roles/update-docker/vars/main.yml
+++ b/roles/update-docker/vars/main.yml
@@ -1,2 +1,2 @@
 application_id: update-docker
-systemctl_id: "{{ application_id }}"
+system_service_id: "{{ application_id }}"