diff --git a/edge-1601-dc5-dc6/inventory-dc5 b/edge-1601-dc5-dc6/inventory-dc5
index 6b47a08..4654714 100644
--- a/edge-1601-dc5-dc6/inventory-dc5
+++ b/edge-1601-dc5-dc6/inventory-dc5
@@ -12,15 +12,13 @@
 [tag_Name_dc5_n12]
 [tag_Name_dc5_n13]
 [tag_Name_dc5_n14]
-
-[tag_Name_dc5_n3:vars]
-zk_observer=true
-
-[tag_Name_dc5_n4:vars]
-zk_observer=true
-
-[tag_Name_dc5_n5:vars]
-zk_observer=true
+[tag_Name_dc5_n15]
+[tag_Name_dc5_n16]
+[tag_Name_dc5_n17]
+[tag_Name_dc5_n18]
+[tag_Name_dc5_n19]
+[tag_Name_dc5_n20]
+[tag_Name_dc5_n21]
 
 [planet:children]
 dc-1
@@ -40,51 +38,66 @@
 tag_Name_dc5_n12
 tag_Name_dc5_n13
 tag_Name_dc5_n14
+tag_Name_dc5_n15
+tag_Name_dc5_n16
+tag_Name_dc5_n17
+tag_Name_dc5_n18
+tag_Name_dc5_n19
+tag_Name_dc5_n20
+tag_Name_dc5_n21
 
 [ds:children]
 dc-1-ds
 
 [dc-1-ds:children]
-tag_Name_dc5_n1
-tag_Name_dc5_n2
 tag_Name_dc5_n3
 tag_Name_dc5_n4
 tag_Name_dc5_n5
 tag_Name_dc5_n6
 tag_Name_dc5_n7
 tag_Name_dc5_n8
+tag_Name_dc5_n9
+tag_Name_dc5_n10
 
 [ms:children]
 dc-1-ms
 
 [dc-1-ms:children]
 tag_Name_dc5_n1
+tag_Name_dc5_n2
 
 [ui:children]
 dc-1-ui
 
 [dc-1-ui:children]
 tag_Name_dc5_n1
+tag_Name_dc5_n2
 
 [ldap:children]
 dc-1-ldap
 
 [dc-1-ldap:children]
 tag_Name_dc5_n1
+tag_Name_dc5_n2
 
 [rmp:children]
 dc-1-rmp
 
 [dc-1-rmp:children]
-tag_Name_dc5_n9
-tag_Name_dc5_n10
+tag_Name_dc5_n11
+tag_Name_dc5_n12
+tag_Name_dc5_n13
+tag_Name_dc5_n14
+tag_Name_dc5_n15
+tag_Name_dc5_n16
+tag_Name_dc5_n17
 
 [qpid:children]
 dc-1-qpid
 
 [dc-1-qpid:children]
-tag_Name_dc5_n11
-tag_Name_dc5_n12
+tag_Name_dc5_n18
+tag_Name_dc5_n19
 
 [pg:children]
 dc-1-pg
@@ -97,10 +110,10 @@
 dc-1-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_dc5_n13
+tag_Name_dc5_n20
 
 [pgstandby:children]
 dc-1-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_dc5_n14
+tag_Name_dc5_n21
diff --git a/edge-1601-dc5-dc6/inventory-dc6 b/edge-1601-dc5-dc6/inventory-dc6
index 658166b..09be6f2 100644
--- a/edge-1601-dc5-dc6/inventory-dc6
+++ b/edge-1601-dc5-dc6/inventory-dc6
@@ -12,15 +12,13 @@
 [tag_Name_dc6_n12]
 [tag_Name_dc6_n13]
 [tag_Name_dc6_n14]
-
-[tag_Name_dc6_n3:vars]
-zk_observer=true
-
-[tag_Name_dc6_n4:vars]
-zk_observer=true
-
-[tag_Name_dc6_n5:vars]
-zk_observer=true
+[tag_Name_dc6_n15]
+[tag_Name_dc6_n16]
+[tag_Name_dc6_n17]
+[tag_Name_dc6_n18]
+[tag_Name_dc6_n19]
+[tag_Name_dc6_n20]
+[tag_Name_dc6_n21]
 
 [planet:children]
 dc-2
@@ -40,51 +38,66 @@
 tag_Name_dc6_n12
 tag_Name_dc6_n13
 tag_Name_dc6_n14
+tag_Name_dc6_n15
+tag_Name_dc6_n16
+tag_Name_dc6_n17
+tag_Name_dc6_n18
+tag_Name_dc6_n19
+tag_Name_dc6_n20
+tag_Name_dc6_n21
 
 [ds:children]
 dc-2-ds
 
 [dc-2-ds:children]
-tag_Name_dc6_n1
-tag_Name_dc6_n2
 tag_Name_dc6_n3
 tag_Name_dc6_n4
 tag_Name_dc6_n5
 tag_Name_dc6_n6
 tag_Name_dc6_n7
 tag_Name_dc6_n8
+tag_Name_dc6_n9
+tag_Name_dc6_n10
 
 [ms:children]
 dc-2-ms
 
 [dc-2-ms:children]
 tag_Name_dc6_n1
+tag_Name_dc6_n2
 
 [ui:children]
 dc-2-ui
 
 [dc-2-ui:children]
 tag_Name_dc6_n1
+tag_Name_dc6_n2
 
 [ldap:children]
 dc-2-ldap
 
 [dc-2-ldap:children]
 tag_Name_dc6_n1
+tag_Name_dc6_n2
 
 [rmp:children]
 dc-2-rmp
 
 [dc-2-rmp:children]
-tag_Name_dc6_n9
-tag_Name_dc6_n10
+tag_Name_dc6_n11
+tag_Name_dc6_n12
+tag_Name_dc6_n13
+tag_Name_dc6_n14
+tag_Name_dc6_n15
+tag_Name_dc6_n16
+tag_Name_dc6_n17
 
 [qpid:children]
 dc-2-qpid
 
 [dc-2-qpid:children]
-tag_Name_dc6_n11
-tag_Name_dc6_n12
+tag_Name_dc6_n18
+tag_Name_dc6_n19
 
 [pg:children]
 dc-2-pg
@@ -97,10 +110,10 @@
 dc-2-pgmaster
 
 [dc-2-pgmaster:children]
-tag_Name_dc6_n13
+tag_Name_dc6_n20
 
 [pgstandby:children]
 dc-2-pgstandby
 
 [dc-2-pgstandby:children]
-tag_Name_dc6_n14
+tag_Name_dc6_n21