diff --git a/aws/oraclelinux68-dc2/inventory b/aws/oraclelinux68-dc2/inventory
index 063d5ea..bb8552e 100644
--- a/aws/oraclelinux68-dc2/inventory
+++ b/aws/oraclelinux68-dc2/inventory
@@ -1,21 +1,21 @@
-[tag_Name_cfrias_1601_edge_ol68_1_n1]
-[tag_Name_cfrias_1601_edge_ol68_1_n2]
-[tag_Name_cfrias_1601_edge_ol68_1_n3]
-[tag_Name_cfrias_1601_edge_ol68_1_n4]
-[tag_Name_cfrias_1601_edge_ol68_1_n5]
-[tag_Name_cfrias_1601_edge_ol68_1_n6]
-[tag_Name_cfrias_1601_edge_ol68_1_n7]
-[tag_Name_cfrias_1601_edge_ol68_1_n8]
-[tag_Name_cfrias_1601_edge_ol68_1_n9]
-[tag_Name_cfrias_1601_edge_ol68_2_n1]
-[tag_Name_cfrias_1601_edge_ol68_2_n2]
-[tag_Name_cfrias_1601_edge_ol68_2_n3]
-[tag_Name_cfrias_1601_edge_ol68_2_n4]
-[tag_Name_cfrias_1601_edge_ol68_2_n5]
-[tag_Name_cfrias_1601_edge_ol68_2_n6]
-[tag_Name_cfrias_1601_edge_ol68_2_n7]
-[tag_Name_cfrias_1601_edge_ol68_2_n8]
-[tag_Name_cfrias_1601_edge_ol68_2_n9]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n1]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n2]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n3]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n4]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n5]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n6]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n7]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n8]
+[tag_Name_cfrias_1601_edge_ol68_dc1_n9]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n1]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n2]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n3]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n4]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n5]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n6]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n7]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n8]
+[tag_Name_cfrias_1601_edge_ol68_dc2_n9]
 
 [tag_Name_cfrias_1601_edge_ol68_dc1_n3:vars]
 zk_observer=true
@@ -25,126 +25,126 @@
 dc-2
 
 [dc-1:children]
-tag_Name_cfrias_1601_edge_ol68_1_n1
-tag_Name_cfrias_1601_edge_ol68_1_n2
-tag_Name_cfrias_1601_edge_ol68_1_n3
-tag_Name_cfrias_1601_edge_ol68_1_n4
-tag_Name_cfrias_1601_edge_ol68_1_n5
-tag_Name_cfrias_1601_edge_ol68_1_n6
-tag_Name_cfrias_1601_edge_ol68_1_n7
-tag_Name_cfrias_1601_edge_ol68_1_n8
-tag_Name_cfrias_1601_edge_ol68_1_n9
+tag_Name_cfrias_1601_edge_ol68_dc1_n1
+tag_Name_cfrias_1601_edge_ol68_dc1_n2
+tag_Name_cfrias_1601_edge_ol68_dc1_n3
+tag_Name_cfrias_1601_edge_ol68_dc1_n4
+tag_Name_cfrias_1601_edge_ol68_dc1_n5
+tag_Name_cfrias_1601_edge_ol68_dc1_n6
+tag_Name_cfrias_1601_edge_ol68_dc1_n7
+tag_Name_cfrias_1601_edge_ol68_dc1_n8
+tag_Name_cfrias_1601_edge_ol68_dc1_n9
 
 [dc-2:children]
-tag_Name_cfrias_1601_edge_ol68_2_n1
-tag_Name_cfrias_1601_edge_ol68_2_n2
-tag_Name_cfrias_1601_edge_ol68_2_n3
-tag_Name_cfrias_1601_edge_ol68_2_n4
-tag_Name_cfrias_1601_edge_ol68_2_n5
-tag_Name_cfrias_1601_edge_ol68_2_n6
-tag_Name_cfrias_1601_edge_ol68_2_n7
-tag_Name_cfrias_1601_edge_ol68_2_n8
-tag_Name_cfrias_1601_edge_ol68_2_n9
+tag_Name_cfrias_1601_edge_ol68_dc2_n1
+tag_Name_cfrias_1601_edge_ol68_dc2_n2
+tag_Name_cfrias_1601_edge_ol68_dc2_n3
+tag_Name_cfrias_1601_edge_ol68_dc2_n4
+tag_Name_cfrias_1601_edge_ol68_dc2_n5
+tag_Name_cfrias_1601_edge_ol68_dc2_n6
+tag_Name_cfrias_1601_edge_ol68_dc2_n7
+tag_Name_cfrias_1601_edge_ol68_dc2_n8
+tag_Name_cfrias_1601_edge_ol68_dc2_n9
 
 [ds:children]
 dc-1-ds
 dc-2-ds
 
 [dc-1-ds:children]
-tag_Name_cfrias_1601_edge_ol68_1_n1
-tag_Name_cfrias_1601_edge_ol68_1_n2
-tag_Name_cfrias_1601_edge_ol68_1_n3
+tag_Name_cfrias_1601_edge_ol68_dc1_n1
+tag_Name_cfrias_1601_edge_ol68_dc1_n2
+tag_Name_cfrias_1601_edge_ol68_dc1_n3
 
 [dc-2-ds:children]
-tag_Name_cfrias_1601_edge_ol68_2_n1
-tag_Name_cfrias_1601_edge_ol68_2_n2
-tag_Name_cfrias_1601_edge_ol68_2_n3
+tag_Name_cfrias_1601_edge_ol68_dc2_n1
+tag_Name_cfrias_1601_edge_ol68_dc2_n2
+tag_Name_cfrias_1601_edge_ol68_dc2_n3
 
 [ms:children]
 dc-1-ms
 dc-2-ms
 
 [dc-1-ms:children]
-tag_Name_cfrias_1601_edge_ol68_1_n1
+tag_Name_cfrias_1601_edge_ol68_dc1_n1
 
 [dc-2-ms:children]
-tag_Name_cfrias_1601_edge_ol68_2_n1
+tag_Name_cfrias_1601_edge_ol68_dc2_n1
 
 [ui:children]
 dc-1-ui
 dc-2-ui
 
 [dc-1-ui:children]
-tag_Name_cfrias_1601_edge_ol68_1_n1
+tag_Name_cfrias_1601_edge_ol68_dc1_n1
 
 [dc-2-ui:children]
-tag_Name_cfrias_1601_edge_ol68_2_n1
+tag_Name_cfrias_1601_edge_ol68_dc2_n1
 
 [ldap:children]
 dc-1-ldap
 dc-2-ldap
 
 [dc-1-ldap:children]
-tag_Name_cfrias_1601_edge_ol68_1_n1
+tag_Name_cfrias_1601_edge_ol68_dc1_n1
 
 [dc-2-ldap:children]
-tag_Name_cfrias_1601_edge_ol68_2_n1
+tag_Name_cfrias_1601_edge_ol68_dc2_n1
 
 [rmp:children]
 dc-1-rmp
 dc-2-rmp
 
 [dc-1-rmp:children]
-tag_Name_cfrias_1601_edge_ol68_1_n4
-tag_Name_cfrias_1601_edge_ol68_1_n5
+tag_Name_cfrias_1601_edge_ol68_dc1_n4
+tag_Name_cfrias_1601_edge_ol68_dc1_n5
 
 [dc-2-rmp:children]
-tag_Name_cfrias_1601_edge_ol68_2_n4
-tag_Name_cfrias_1601_edge_ol68_2_n5
+tag_Name_cfrias_1601_edge_ol68_dc2_n4
+tag_Name_cfrias_1601_edge_ol68_dc2_n5
 
 [qpid:children]
 dc-1-qpid
 dc-2-qpid
 
 [dc-1-qpid:children]
-tag_Name_cfrias_1601_edge_ol68_1_n6
-tag_Name_cfrias_1601_edge_ol68_1_n7
+tag_Name_cfrias_1601_edge_ol68_dc1_n6
+tag_Name_cfrias_1601_edge_ol68_dc1_n7
 
 [dc-2-qpid:children]
-tag_Name_cfrias_1601_edge_ol68_2_n6
-tag_Name_cfrias_1601_edge_ol68_2_n7
+tag_Name_cfrias_1601_edge_ol68_dc2_n6
+tag_Name_cfrias_1601_edge_ol68_dc2_n7
 
 [pg:children]
 dc-1-pg
 dc-2-pg
 
 [dc-1-pg:children]
-tag_Name_cfrias_1601_edge_ol68_1_n8
-tag_Name_cfrias_1601_edge_ol68_1_n9
+tag_Name_cfrias_1601_edge_ol68_dc1_n8
+tag_Name_cfrias_1601_edge_ol68_dc1_n9
 
 [dc-2-pg:children]
-tag_Name_cfrias_1601_edge_ol68_2_n8
-tag_Name_cfrias_1601_edge_ol68_2_n9
+tag_Name_cfrias_1601_edge_ol68_dc2_n8
+tag_Name_cfrias_1601_edge_ol68_dc2_n9
 
 [pgmaster:children]
 dc-1-pgmaster
 dc-2-pgmaster
 
 [dc-1-pgmaster:children]
-tag_Name_cfrias_1601_edge_ol68_1_n8
+tag_Name_cfrias_1601_edge_ol68_dc1_n8
 
 [dc-2-pgmaster:children]
-tag_Name_cfrias_1601_edge_ol68_2_n8
+tag_Name_cfrias_1601_edge_ol68_dc2_n8
 
 [pgstandby:children]
 dc-1-pgstandby
 dc-2-pgstandby
 
 [dc-1-pgstandby:children]
-tag_Name_cfrias_1601_edge_ol68_1_n9
+tag_Name_cfrias_1601_edge_ol68_dc1_n9
 
 [dc-2-pgstandby:children]
-tag_Name_cfrias_1601_edge_ol68_2_n9
+tag_Name_cfrias_1601_edge_ol68_dc2_n9
 
 [dc-1-central:children]
 dc-1-ui