diff --git a/roles/sys-svc-cert-sync-docker/files/sys-svc-cert-sync-docker.sh b/roles/sys-svc-cert-sync-docker/files/sys-svc-cert-sync-docker.sh
index 09e749c4..2b83acb5 100644
--- a/roles/sys-svc-cert-sync-docker/files/sys-svc-cert-sync-docker.sh
+++ b/roles/sys-svc-cert-sync-docker/files/sys-svc-cert-sync-docker.sh
@@ -2,7 +2,7 @@
 
 # Check if the necessary parameters are provided
 if [ "$#" -ne 3 ]; then
-    echo "Usage: $0 <ssl_cert_folder> <docker_compose_instance_directory>"
+    echo "Usage: $0 <ssl_cert_folder> <docker_compose_instance_directory> <letsencrypt_live_path>"
     exit 1
 fi
 
diff --git a/roles/sys-svc-cert-sync-docker/handlers/main.yml b/roles/sys-svc-cert-sync-docker/handlers/main.yml
index 05305c94..42d4c81b 100644
--- a/roles/sys-svc-cert-sync-docker/handlers/main.yml
+++ b/roles/sys-svc-cert-sync-docker/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: "restart tls deploy to docker service"
   systemd:
-    name:           "{{ CERT_SYNC_DOCKER_SERVICE_NAME }}"
+    name:           "{{ CERT_SYNC_DOCKER_SERVICE_NAME_FULL }}"
     state:          restarted
     enabled:        yes
     daemon_reload:  yes
\ No newline at end of file
diff --git a/roles/sys-svc-cert-sync-docker/tasks/main.yml b/roles/sys-svc-cert-sync-docker/tasks/main.yml
index 229c564d..9dab1618 100644
--- a/roles/sys-svc-cert-sync-docker/tasks/main.yml
+++ b/roles/sys-svc-cert-sync-docker/tasks/main.yml
@@ -11,17 +11,17 @@
     mode: "0755"
   notify: restart tls deploy to docker service
 
-- name: configure sys-svc-cert-sync-docker service
+- name: Copy {{ CERT_SYNC_DOCKER_SERVICE_NAME_FULL }}
   template:
-    src: "sys-svc-cert-sync-docker.service.j2"
-    dest: "/etc/systemd/system/{{ CERT_SYNC_DOCKER_SERVICE_NAME }}"
+    src: "{{ CERT_SYNC_DOCKER_BASE }}.service.j2"
+    dest: "/etc/systemd/system/{{ CERT_SYNC_DOCKER_SERVICE_NAME_FULL }}"
   notify: restart tls deploy to docker service
 
-- name: "include role for sys-timer for {{ service_name }}"
+- name: "include role for sys-timer for {{ CERT_SYNC_DOCKER_SERVICE_NAME_FULL }}"
   include_role:
     name: sys-timer
   vars:
     on_calendar: "{{ on_calendar_deploy_certificates }}"
-    service_name: "{{ CERT_SYNC_DOCKER_SERVICE_NAME }}"
+    service_name: "{{ CERT_SYNC_DOCKER_SERVICE_NAME_BASE }}"
     persistent: "true"
 
diff --git a/roles/sys-svc-cert-sync-docker/vars/main.yml b/roles/sys-svc-cert-sync-docker/vars/main.yml
index 3e8dbf06..9ca544c3 100644
--- a/roles/sys-svc-cert-sync-docker/vars/main.yml
+++ b/roles/sys-svc-cert-sync-docker/vars/main.yml
@@ -1,3 +1,6 @@
-CERT_SYNC_DOCKER_SCRIPT_FILE:   "sys-svc-cert-sync-docker.sh"
-CERT_SYNC_DOCKER_SCRIPT_PATH:   "{{ PATH_ADMINISTRATOR_SCRIPTS }}{{ CERT_SYNC_DOCKER_SCRIPT_FILE }}"
-CERT_SYNC_DOCKER_SERVICE_NAME:  "sys-svc-cert-sync-docker.{{ application_id }}{{ SYS_SERVICE_SUFFIX }}"
\ No newline at end of file
+
+CERT_SYNC_DOCKER_BASE:               "sys-svc-cert-sync-docker"
+CERT_SYNC_DOCKER_SCRIPT_FILE:        "{{ CERT_SYNC_DOCKER_BASE }}.sh"
+CERT_SYNC_DOCKER_SCRIPT_PATH:        "{{ PATH_ADMINISTRATOR_SCRIPTS }}{{ CERT_SYNC_DOCKER_SCRIPT_FILE }}"
+CERT_SYNC_DOCKER_SERVICE_NAME_BASE:  "{{ application_id | get_entity_name }}.{{ CERT_SYNC_DOCKER_BASE }}"
+CERT_SYNC_DOCKER_SERVICE_NAME_FULL:  "{{ CERT_SYNC_DOCKER_SERVICE_NAME_BASE }}{{ SYS_SERVICE_SUFFIX }}"
\ No newline at end of file