diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index f39988c50..f01b29372 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -33,6 +33,15 @@
     - ceph-mon
   serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS
 
+- hosts: mgrs
+  become: True
+  gather_facts: false
+  roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+
 - hosts: osds
   become: True
   gather_facts: false
@@ -87,15 +96,6 @@
     - ceph-config
     - ceph-restapi
 
-- hosts: mgrs
-  become: True
-  gather_facts: false
-  roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-
 - hosts: clients
   become: True
   gather_facts: false
diff --git a/site.yml.sample b/site.yml.sample
index 113e9bb03..2e46bbacb 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -61,6 +61,15 @@
     - ceph-config
     - ceph-mon
 
+- hosts: mgrs
+  gather_facts: false
+  become: True
+  roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+
 - hosts: agents
   gather_facts: false
   become: True
@@ -133,15 +142,6 @@
     - ceph-config
     - ceph-client
 
-- hosts: mgrs
-  gather_facts: false
-  become: True
-  roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-
 - hosts: iscsi_gws
   gather_facts: false
   become: True
diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts
index ea51342dd..50264e226 100644
--- a/tests/functional/centos/7/bluestore/hosts
+++ b/tests/functional/centos/7/bluestore/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.1.10
 mon1 monitor_interface=eth1
 mon2 monitor_address=192.168.1.12
 
+[mgrs]
+mon0
+
 [osds]
 osd0
 
@@ -14,6 +17,3 @@ rgw0
 
 [clients]
 client0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
+++ b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-crypt-jrn-col/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/bs-crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/bs-crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/hosts b/tests/functional/centos/7/bs-dock-ded-jrn/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/bs-dock-ded-jrn/hosts
+++ b/tests/functional/centos/7/bs-dock-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/bs-jrn-col/hosts b/tests/functional/centos/7/bs-jrn-col/hosts
index 6085b1d2f..9bafa880c 100644
--- a/tests/functional/centos/7/bs-jrn-col/hosts
+++ b/tests/functional/centos/7/bs-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0 monitor_interface=eth1
 
-[osds]
-osd0
-
 [mgrs]
 mon0
+
+[osds]
+osd0
diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 058639646..bddde7c58 100644
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -3,6 +3,9 @@ ceph-mon0 monitor_address=192.168.1.10
 ceph-mon1 monitor_interface=eth1
 ceph-mon2 monitor_address=192.168.1.12
 
+[mgrs]
+ceph-mgr0
+
 [osds]
 ceph-osd0
 
@@ -15,9 +18,6 @@ ceph-rgw0
 [clients]
 ceph-client0
 
-[mgrs]
-ceph-mgr0
-
 [nfss]
 ceph-nfs0
 
diff --git a/tests/functional/centos/7/crypt-ded-jrn/hosts b/tests/functional/centos/7/crypt-ded-jrn/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/crypt-ded-jrn/hosts
+++ b/tests/functional/centos/7/crypt-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/crypt-jrn-col/hosts b/tests/functional/centos/7/crypt-jrn-col/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/hosts b/tests/functional/centos/7/docker-crypt-jrn-col/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/docker-crypt-jrn-col/hosts
+++ b/tests/functional/centos/7/docker-crypt-jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/docker-ded-jrn/hosts b/tests/functional/centos/7/docker-ded-jrn/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/docker-ded-jrn/hosts
+++ b/tests/functional/centos/7/docker-ded-jrn/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
index 7e0ab98a1..4696f238f 100644
--- a/tests/functional/centos/7/docker/hosts
+++ b/tests/functional/centos/7/docker/hosts
@@ -3,6 +3,9 @@ mon0
 mon1
 mon2
 
+[mgrs]
+mgr0
+
 [osds]
 osd0
 
@@ -12,9 +15,6 @@ mds0
 [rgws]
 rgw0
 
-[mgrs]
-mgr0
-
 [nfss]
 nfs0
 
diff --git a/tests/functional/centos/7/jrn-col-auto-dm/hosts b/tests/functional/centos/7/jrn-col-auto-dm/hosts
index f6a265ab3..d6c89012a 100644
--- a/tests/functional/centos/7/jrn-col-auto-dm/hosts
+++ b/tests/functional/centos/7/jrn-col-auto-dm/hosts
@@ -1,5 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
diff --git a/tests/functional/centos/7/jrn-col-auto/hosts b/tests/functional/centos/7/jrn-col-auto/hosts
index f6a265ab3..d6c89012a 100644
--- a/tests/functional/centos/7/jrn-col-auto/hosts
+++ b/tests/functional/centos/7/jrn-col-auto/hosts
@@ -1,5 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
diff --git a/tests/functional/centos/7/jrn-col/hosts b/tests/functional/centos/7/jrn-col/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/jrn-col/hosts
+++ b/tests/functional/centos/7/jrn-col/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/centos/7/lvm-osds/hosts b/tests/functional/centos/7/lvm-osds/hosts
index e1c1de6f8..d6c89012a 100644
--- a/tests/functional/centos/7/lvm-osds/hosts
+++ b/tests/functional/centos/7/lvm-osds/hosts
@@ -1,8 +1,8 @@
 [mons]
 mon0
 
+[mgrs]
+mon0
+
 [osds]
 osd0
-
-[mgrs]
-mon0
diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
index e42554e9b..98355f3b8 100644
--- a/tests/functional/ubuntu/16.04/cluster/hosts
+++ b/tests/functional/ubuntu/16.04/cluster/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.5.10
 mon1 monitor_address=192.168.5.11
 mon2 monitor_address=192.168.5.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0
 
@@ -15,8 +18,5 @@ rgw0
 [clients]
 client0
 
-[mgrs]
-mgr0
-
 [nfss]
 nfs0