diff --git a/roles/commands/tasks/main.yml b/roles/commands/tasks/main.yml
index f8481c3..c69ed3f 100644
--- a/roles/commands/tasks/main.yml
+++ b/roles/commands/tasks/main.yml
@@ -8,5 +8,5 @@
   changed_when: true
   when: cephadm_commands | length > 0
 
-  delegate_to: "{{ groups['mons'][0] }}"
+  delegate_to: "{{ cephadm_bootstrap_host }}"
   run_once: true
diff --git a/roles/crush_rules/tasks/main.yml b/roles/crush_rules/tasks/main.yml
index 5988348..ffdd71c 100644
--- a/roles/crush_rules/tasks/main.yml
+++ b/roles/crush_rules/tasks/main.yml
@@ -9,5 +9,5 @@
     device_class: "{{ item.device_class | default(omit) }}"
     profile: "{{ item.profile | default(omit) }}"
   with_items: "{{ cephadm_crush_rules }}"
-  delegate_to: "{{ groups['mons'][0] }}"
+  delegate_to: "{{ cephadm_bootstrap_host }}"
   run_once: true
diff --git a/roles/ec_profiles/tasks/main.yml b/roles/ec_profiles/tasks/main.yml
index cbbeb38..6b4845c 100644
--- a/roles/ec_profiles/tasks/main.yml
+++ b/roles/ec_profiles/tasks/main.yml
@@ -11,5 +11,5 @@
     crush_root: "{{ item.crush_root | default(omit) }}"
     crush_device_class: "{{ item.crush_device_class | default(omit) }}"
   with_items: "{{ cephadm_ec_profiles }}"
-  delegate_to: "{{ groups['mons'][0] }}"
+  delegate_to: "{{ cephadm_bootstrap_host }}"
   run_once: true
diff --git a/roles/keys/tasks/main.yml b/roles/keys/tasks/main.yml
index c2b6614..f62ad84 100644
--- a/roles/keys/tasks/main.yml
+++ b/roles/keys/tasks/main.yml
@@ -6,5 +6,5 @@
     caps: "{{ item.caps }}"
     secret: "{{ item.key | default(omit) }}"
   with_items: "{{ cephadm_keys }}"
-  delegate_to: "{{ groups['mons'][0] }}"
+  delegate_to: "{{ cephadm_bootstrap_host }}"
   run_once: true
diff --git a/roles/pools/tasks/main.yml b/roles/pools/tasks/main.yml
index 4bea2cc..0ef9e73 100644
--- a/roles/pools/tasks/main.yml
+++ b/roles/pools/tasks/main.yml
@@ -15,5 +15,5 @@
     application: "{{ item.application | default(omit) }}"
     allow_ec_overwrites: "{{ item.allow_ec_overwrites | default(omit) }}"
   with_items: "{{ cephadm_pools }}"
-  delegate_to: "{{ groups['mons'][0] }}"
+  delegate_to: "{{ cephadm_bootstrap_host }}"
   run_once: true