diff --git a/ansible/roles/chrony/handlers/main.yml b/ansible/roles/chrony/handlers/main.yml
index 25930686d7..7c0b4c8371 100644
--- a/ansible/roles/chrony/handlers/main.yml
+++ b/ansible/roles/chrony/handlers/main.yml
@@ -10,3 +10,7 @@
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
+  when:
+    - action != "config"
+    - inventory_hostname in groups[service.group]
+    - service.enabled | bool
diff --git a/ansible/roles/chrony/tasks/config.yml b/ansible/roles/chrony/tasks/config.yml
index db6f1deec9..9afc2f7ffb 100644
--- a/ansible/roles/chrony/tasks/config.yml
+++ b/ansible/roles/chrony/tasks/config.yml
@@ -36,9 +36,9 @@
     privileged: "{{ item.value.privileged }}"
     volumes: "{{ item.value.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
-    - action != "genconfig"
   with_dict: "{{ chrony_services }}"
   notify:
     - Restart chrony container