diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index ac158a084..893f9ff57 100644
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -22,12 +22,11 @@
 
 - name: include secure_cluster.yml
   include_tasks: secure_cluster.yml
-  delegate_to: "{{ groups[mon_group_name][0] }}"
-  run_once: true
   when:
     - secure_cluster
+    - inventory_hostname == groups[mon_group_name] | first
 
 - name: crush_rules.yml
   include_tasks: crush_rules.yml
   when:
-    - crush_rule_config
\ No newline at end of file
+    - crush_rule_config