diff --git a/conf/squid/common/3node-1client.yaml b/conf/squid/common/3node-1client.yaml
index da34d00bce7..14bd9ed5faf 100644
--- a/conf/squid/common/3node-1client.yaml
+++ b/conf/squid/common/3node-1client.yaml
@@ -7,35 +7,26 @@ globals:
           - installer
           - mon
           - mgr
-          - osd
           - crash
-          - grafana
-          - prometheus
-          - node-exporter
-          - alertmanager
+          - osd
         no-of-volumes: 6
         disk-size: 20
       node2:
         role:
           - mon
           - mgr
-          - mds
-          - osd
-          - rgw
           - crash
-          - node-exporter
-          - alertmanager
+          - rgw
+          - osd
         no-of-volumes: 6
         disk-size: 20
       node3:
         role:
           - mon
           - mgr
+          - crash
           - mds
           - osd
-          - rgw
-          - crash
-          - node-exporter
         no-of-volumes: 6
         disk-size: 20
       node4:
diff --git a/conf/squid/common/5node-2client-rh.yaml b/conf/squid/common/5node-2client-rh.yaml
index ef5e97b2b4b..6b81a7f511a 100644
--- a/conf/squid/common/5node-2client-rh.yaml
+++ b/conf/squid/common/5node-2client-rh.yaml
@@ -8,44 +8,45 @@ globals:
           - mon
           - mgr
           - crash
-          - grafana
-          - prometheus
           - alertmanager
       node2:
         role:
           - mon
           - mgr
-          - osd
+          - crash
           - rgw
           - nfs
-          - crash
+          - osd
         no-of-volumes: 6
         disk-size: 40
       node3:
         role:
           - mon
           - mgr
-          - osd
-          - rgw
           - crash
+          - rgw
+          - nfs
+          - osd
         no-of-volumes: 6
         disk-size: 40
       node4:
         role:
           - mon
           - mgr
+          - crash
+          - grafana
           - mds
           - osd
-          - crash
         no-of-volumes: 6
         disk-size: 40
       node5:
         role:
           - mon
           - mgr
+          - crash
           - mds
+          - prometheus
           - osd
-          - crash
         no-of-volumes: 6
         disk-size: 40
       node6:
diff --git a/conf/squid/common/7node-2client-ibm.yaml b/conf/squid/common/7node-2client-ibm.yaml
index 57243204b77..3815328b06e 100644
--- a/conf/squid/common/7node-2client-ibm.yaml
+++ b/conf/squid/common/7node-2client-ibm.yaml
@@ -8,44 +8,45 @@ globals:
           - mon
           - mgr
           - crash
-          - grafana
-          - prometheus
           - alertmanager
       node2:
         role:
           - mon
           - mgr
-          - osd
+          - crash
           - rgw
           - nfs
-          - crash
+          - osd
         no-of-volumes: 6
         disk-size: 40
       node3:
         role:
           - mon
           - mgr
-          - osd
-          - rgw
           - crash
+          - rgw
+          - nfs
+          - osd
         no-of-volumes: 6
         disk-size: 40
       node4:
         role:
           - mon
           - mgr
+          - crash
+          - grafana
           - mds
           - osd
-          - crash
         no-of-volumes: 6
         disk-size: 40
       node5:
         role:
           - mon
           - mgr
+          - crash
           - mds
+          - prometheus
           - osd
-          - crash
         no-of-volumes: 6
         disk-size: 40
       node6: