diff --git a/templates/group_vars_mash_servers b/templates/group_vars_mash_servers
index 7c4f7c4..c2d3052 100644
--- a/templates/group_vars_mash_servers
+++ b/templates/group_vars_mash_servers
@@ -1134,7 +1134,7 @@ devture_traefik_container_additional_networks_auto: |
 
 devture_traefik_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_container_socket_proxy_identifier + '.service'] if devture_container_socket_proxy_enabled | default(false) else [])
   }}
@@ -1483,7 +1483,7 @@ backup_borg_location_exclude_patterns: |
 
 backup_borg_systemd_required_services_list: |
   {{
-    ['docker.service']
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled | default(false) else [])
     +
@@ -1838,7 +1838,7 @@ echoip_gid: "{{ mash_playbook_gid }}"
 
 echoip_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
   }}
 
 echoip_container_additional_networks: |
@@ -2037,7 +2037,7 @@ freshrss_gid: "33"
 
 freshrss_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and freshrss_database_hostname == devture_postgres_identifier else [])
   }}
@@ -2148,7 +2148,7 @@ gitea_gid: "{{ mash_playbook_gid }}"
 
 gitea_systemd_required_systemd_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and gitea_config_database_hostname == devture_postgres_identifier else [])
   }}
@@ -2374,7 +2374,7 @@ hubsite_gid: "{{ mash_playbook_gid }}"
 
 hubsite_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
   }}
 
 hubsite_container_additional_networks: |
@@ -3040,7 +3040,7 @@ ilmo_database_username: "ilmo"
 
 ilmo_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and ilmo_database_host == devture_postgres_identifier else [])
   }}
@@ -3084,7 +3084,7 @@ infisical_gid: "{{ mash_playbook_gid }}"
 
 infisical_backend_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([mongodb_identifier ~ '.service'] if mongodb_enabled and infisical_mongodb_hostname == mongodb_identifier else [])
   }}
@@ -3416,7 +3416,7 @@ linkding_gid: "{{ mash_playbook_gid }}"
 
 linkding_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and linkding_database_hostname == devture_postgres_identifier else [])
   }}
@@ -3464,7 +3464,7 @@ miniflux_gid: "{{ mash_playbook_gid }}"
 
 miniflux_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and miniflux_database_hostname == devture_postgres_identifier else [])
   }}
@@ -3520,7 +3520,7 @@ mobilizon_database_username: "mobilizon"
 
 mobilizon_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([postgis_identifier ~ '.service'] if postgis_enabled and mobilizon_database_hostname == postgis_identifier else [])
   }}
@@ -3658,7 +3658,7 @@ n8n_gid: "1000"
 
 n8n_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and n8n_database_hostname == devture_postgres_identifier else [])
   }}
@@ -3903,7 +3903,7 @@ notfellchen_database_username: "notfellchen"
 
 notfellchen_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and notfellchen_database_host == devture_postgres_identifier else [])
   }}
@@ -4073,7 +4073,7 @@ oxitraffic_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key
 
 oxitraffic_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and oxitraffic_database_hostname == devture_postgres_identifier else [])
   }}
@@ -4123,7 +4123,7 @@ paperless_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key)
 
 paperless_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and paperless_database_hostname == devture_postgres_identifier else [])
   }}
@@ -4304,7 +4304,7 @@ prometheus_postgres_exporter_database_ssl: false
 
 prometheus_postgres_exporter_systemd_required_services_list: |
   {{
-    ['docker.service']
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
   }}
@@ -4605,7 +4605,7 @@ redmine_database_cipher_key: "{{ '%s' | format(mash_playbook_generic_secret_key)
 
 redmine_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and redmine_database_hostname == devture_postgres_identifier else [])
   }}
@@ -4718,7 +4718,7 @@ roundcube_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key)
 
 roundcube_systemd_required_systemd_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and roundcube_database_hostname == devture_postgres_identifier else [])
   }}
@@ -4792,7 +4792,7 @@ semaphore_database_username: "{{ semaphore_identifier }}"
 
 semaphore_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and semaphore_database_host == devture_postgres_identifier else [])
   }}
@@ -4963,7 +4963,7 @@ telegraf_gid: "{{ mash_playbook_gid }}"
 
 telegraf_systemd_required_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([(influxdb_identifier + '.service')] if influxdb_enabled else [])
   }}
@@ -5127,7 +5127,7 @@ forgejo_gid: "{{ mash_playbook_gid }}"
 
 forgejo_systemd_required_systemd_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and forgejo_config_database_hostname == devture_postgres_identifier else [])
   }}
@@ -5176,7 +5176,7 @@ devture_woodpecker_ci_server_base_path: "{{ mash_playbook_base_path }}/{{ mash_p
 
 devture_woodpecker_ci_server_systemd_required_systemd_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and devture_woodpecker_ci_server_database_datasource_hostname == devture_postgres_identifier else [])
   }}
@@ -5229,7 +5229,7 @@ devture_woodpecker_ci_agent_base_path: "{{ mash_playbook_base_path }}/{{ mash_pl
 
 devture_woodpecker_ci_agent_systemd_required_systemd_services_list: |
   {{
-    (['docker.service'])
+    ([devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [])
     +
     ([devture_woodpecker_ci_server_identifier ~ '.service'] if devture_woodpecker_ci_server_enabled else [])
   }}