diff --git a/aws/1601-oraclelinux68-baas/inventory b/aws/1601-oraclelinux68-baas/inventory
index f5bace8..668e8e2 100644
--- a/aws/1601-oraclelinux68-baas/inventory
+++ b/aws/1601-oraclelinux68-baas/inventory
@@ -1,55 +1,61 @@
-[tag_Name_cfrias_1601_baas_ol68_1_n1]
-[tag_Name_cfrias_1601_baas_ol68_1_n2]
-[tag_Name_cfrias_1601_baas_ol68_1_n3]
-[tag_Name_cfrias_1601_baas_ol68_1_n4]
-[tag_Name_cfrias_1601_baas_ol68_1_n5]
-[tag_Name_cfrias_1601_baas_ol68_1_n6]
-[tag_Name_cfrias_1601_baas_ol68_1_n7]
-[tag_Name_cfrias_1601_baas_ol68_1_n8]
-[tag_Name_cfrias_1601_baas_ol68_1_n9]
-[tag_Name_cfrias_1601_baas_ol68_1_n10]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n1]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n2]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n3]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n4]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n5]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n6]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n7]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n8]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n9]
+[tag_Name_cfrias_1601_baas_oraclelinux68_1_n10]
 
 [planet:children]
 dc-1
 
 [dc-1:children]
-tag_Name_cfrias_1601_baas_ol68_1_n1
-tag_Name_cfrias_1601_baas_ol68_1_n2
-tag_Name_cfrias_1601_baas_ol68_1_n3
-tag_Name_cfrias_1601_baas_ol68_1_n4
-tag_Name_cfrias_1601_baas_ol68_1_n5
-tag_Name_cfrias_1601_baas_ol68_1_n6
-tag_Name_cfrias_1601_baas_ol68_1_n7
-tag_Name_cfrias_1601_baas_ol68_1_n8
-tag_Name_cfrias_1601_baas_ol68_1_n9
-tag_Name_cfrias_1601_baas_ol68_1_n10
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n1
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n2
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n3
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n4
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n5
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n6
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n7
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n8
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n9
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n10
 
 [elastic:children]
 dc-1-elastic
 
 [dc-1-elastic:children]
-tag_Name_cfrias_1601_baas_ol68_1_n1
-tag_Name_cfrias_1601_baas_ol68_1_n2
-tag_Name_cfrias_1601_baas_ol68_1_n3
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n1
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n2
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n3
 
 [baas:children]
 dc-1-baas
 
 [dc-1-baas:children]
-tag_Name_cfrias_1601_baas_ol68_1_n4
-tag_Name_cfrias_1601_baas_ol68_1_n5
-tag_Name_cfrias_1601_baas_ol68_1_n6
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n4
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n5
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n6
 
 [portal:children]
 dc-1-portal
 
 [dc-1-portal:children]
-tag_Name_cfrias_1601_baas_ol68_1_n7
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n7
 
 [cassandra:children]
 dc-1-cassandra
 
+[dc-1-ds:children]
+dc-1-cassandra
+
+[ds:children]
+dc-1-cassandra
+
 [dc-1-cassandra:children]
-tag_Name_cfrias_1601_baas_ol68_1_n8
-tag_Name_cfrias_1601_baas_ol68_1_n9
-tag_Name_cfrias_1601_baas_ol68_1_n10
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n8
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n9
+tag_Name_cfrias_1601_baas_oraclelinux68_1_n10