diff --git a/roles/sys-daemon/defaults/main.yml b/roles/sys-daemon/defaults/main.yml
index bb5bed7b..18f2ee6c 100644
--- a/roles/sys-daemon/defaults/main.yml
+++ b/roles/sys-daemon/defaults/main.yml
@@ -1,8 +1,7 @@
 # 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
+SYSTEMD_MANAGER_CONF_DIR:       "/etc/systemd/system.conf.d"   # Directory for systemd manager drop-in configuration files
 
+# Defaults (system-wide service timeouts)
+SYSTEMD_DEFAULT_TIMEOUT_START:  "24h"  # How long systemd waits for a service to reach the "active" state during startup
+SYSTEMD_DEFAULT_TIMEOUT_STOP:   "90s"  # How long systemd waits for a service to stop gracefully after receiving a stop command
+SYSTEMD_DEFAULT_TIMEOUT_ABORT:  "90s"  # Extra grace period after the stop timeout expires, before systemd sends SIGKILL to force termination
diff --git a/roles/sys-service/tasks/01_core.yml b/roles/sys-service/tasks/01_core.yml
index 84066247..5fd5497f 100644
--- a/roles/sys-service/tasks/01_core.yml
+++ b/roles/sys-service/tasks/01_core.yml
@@ -1,6 +1,7 @@
 - name: Include dependency 'sys-daemon'
   include_role:
     name: sys-daemon
+    public: true
   when: run_once_sys_daemon is not defined
   
 - name: "reset (if enabled)"
diff --git a/roles/sys-service/vars/main.yml b/roles/sys-service/vars/main.yml
index efbdea61..54a91166 100644
--- a/roles/sys-service/vars/main.yml
+++ b/roles/sys-service/vars/main.yml
@@ -24,4 +24,4 @@ system_service_tpl_runtime:           "{{ '' if system_service_tpl_type == 'ones
 system_service_tpl_exec_start_pre:    ""
 system_service_tpl_exec_start:        "{{ system_service_script_exec }}"
 system_service_tpl_exec_start_post:   ""
-system_service_tpl_timeout_start_sec: "60s"
\ No newline at end of file
+system_service_tpl_timeout_start_sec: "" # If not defined the default values from sys-daemon in manager will be used
\ No newline at end of file