diff --git a/handlers/main.yml b/handlers/main.yml
index 49df1672..52f17b87 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -24,7 +24,7 @@
 
 - name: restart chrony
   service:
-    name: chrony
+    name: "{{ chrony_service }}"
     state: restarted
 
 - name: restart fail2ban
diff --git a/tasks/misc.yml b/tasks/misc.yml
index d3583ffa..8d1c4df4 100644
--- a/tasks/misc.yml
+++ b/tasks/misc.yml
@@ -63,7 +63,7 @@
 - name: V-38620 - Synchronize system clock (configuration file)
   template:
     src: chrony.conf.j2
-    dest: /etc/chrony/chrony.conf
+    dest: "{{ chrony_conf_file }}"
   when:
     - not check_mode
     - security_enable_chrony | bool
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 5948c456..5e7d2595 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -20,6 +20,7 @@ vsftpd_conf_file: /etc/vsftpd/vsftpd.conf
 grub_conf_file: /boot/grub2/grub.cfg
 aide_cron_job_path: /etc/cron.d/aide
 aide_database_file: /var/lib/aide/aide.db.gz
+chrony_conf_file: /etc/chrony.conf
 
 # Package names
 auditd_pkg: audit
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 1725ad59..e095aabb 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -23,6 +23,7 @@ vsftpd_conf_file: /etc/vsftpd.conf
 grub_conf_file: /boot/grub/grub.cfg
 aide_cron_job_path: /etc/cron.daily/aide
 aide_database_file: /var/lib/aide/aide.db
+chrony_conf_file: /etc/chrony/chrony.conf
 
 # Package names
 auditd_pkg: auditd