diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 5ff2e5d..04fa44d 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -22,8 +22,8 @@
       pullPolicy: IfNotPresent
     robot:
       flavor: large
-      appcUsername: "admin"
-      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      appcUsername: "appc@appc.onap.org"
+      appcPassword: "demo123456!"
       openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
       openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -51,7 +51,6 @@
       replicaCount: 3
       config:
         enableClustering: true
-        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
@@ -59,8 +58,6 @@
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
-        odlUser: admin
-        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 300c80b..15819ff 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -22,8 +22,8 @@
       pullPolicy: IfNotPresent
     robot:
       flavor: large
-      appcUsername: "admin"
-      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      appcUsername: "appc@appc.onap.org"
+      appcPassword: "demo123456!"
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -52,7 +52,6 @@
       replicaCount: 3
       config:
         enableClustering: true
-        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
@@ -60,8 +59,6 @@
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
-        odlUser: admin
-        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 3
       config: