diff --git a/roles/pvc/tasks/ceph/bootstrap.yml b/roles/pvc/tasks/ceph/bootstrap.yml
index 13ac734..cd9d879 100644
--- a/roles/pvc/tasks/ceph/bootstrap.yml
+++ b/roles/pvc/tasks/ceph/bootstrap.yml
@@ -57,12 +57,7 @@
   command: ceph-authtool /tmp/ceph-bootstrap/ceph.mon.keyring --import-keyring /tmp/ceph-bootstrap/ceph.osd.bootstrap.keyring
 
 - name: create monmap
-  command: monmaptool --create --fsid {{ fsid }} /tmp/ceph-bootstrap/monmap
-
-- name: add monitors to monmap
-  command: monmaptool --add {{ item.hostname }} {{ item.cluster_ip }} --fsid {{ fsid }} /tmp/ceph-bootstrap/monmap
-  with_items:
-    - "{{ pvc_nodes }}"
+  command: monmaptool --create --fsid {{ fsid }} {% for node in pvc_nodes if node.is_coordinator %}--add {{ node.hostname }} {{ node.cluster_ip }} {% endfor %} /tmp/ceph-bootstrap/monmap
 
 - name: copy initial ceph.conf to the boostrap directory
   copy:
diff --git a/roles/pvc/tasks/ceph/main.yml b/roles/pvc/tasks/ceph/main.yml
index b7a93e4..c405b2e 100644
--- a/roles/pvc/tasks/ceph/main.yml
+++ b/roles/pvc/tasks/ceph/main.yml
@@ -61,7 +61,7 @@
   when: newhost is defined and newhost
 
 - name: populate monitor with map and keys
-  command: ceph-mon --mkfs -i {{ ansible_hostname }} --monmap /etc/ceph/monmap --keyring /etc/ceph/ceph.mon.keyring
+  command: ceph-mon --cluster ceph --mkfs -i {{ ansible_hostname }} --monmap /etc/ceph/monmap --keyring /etc/ceph/ceph.mon.keyring
   become_user: ceph
   when: newhost is defined and newhost
 
diff --git a/roles/pvc/tasks/main.yml b/roles/pvc/tasks/main.yml
index 9c13b39..1ff4a28 100644
--- a/roles/pvc/tasks/main.yml
+++ b/roles/pvc/tasks/main.yml
@@ -6,14 +6,17 @@
   args:
     creates: /etc/pvc-install
   register: newhost_check
+  tags: always
 
 - name: set newhost fact
   set_fact:
     newhost: yes
   when: newhost_check.changed
+  tags: always
 
 - include: common/add_cluster_ips.yml
   when: newhost is defined and newhost
+  tags: always
 
 # General blacklisting of modules
 - name: add module blacklist
@@ -38,12 +41,13 @@
 - include: frr/main.yml
   tags: pvc-frr
 
-- include: remove_cluster_ips.yml
+- include: common/remove_cluster_ips.yml
   when: newhost is defined and newhost
+#  tags: always
 
 # Install PVC sequentially
 - include: pvc/main.yml
-  tags: pvc-pvc
+  tags: pvc-daemon
   run_once: true
   delegate_to: "{{ play_host }}"
   with_items: "{{ play_hosts }}"