diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
index dacb243..40936b1 100644
--- a/deployment/heat/onap-oom/env/gwu/onap-oom.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env
@@ -20,7 +20,6 @@
     robot:
       openStackKeyStoneUrl: "http://192.168.1.11:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "trusty"
@@ -34,6 +33,8 @@
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"
       rancherIpAddress: "__rancher_ip_addr__"
+      config:
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
index 4991ab9..c02d1a6 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env
@@ -20,7 +20,6 @@
     robot:
       openStackKeyStoneUrl: "http://10.145.122.118:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "trusty"
@@ -34,6 +33,8 @@
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"
       rancherIpAddress: "__rancher_ip_addr__"
+      config:
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index ec3399b..3e59b04 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -19,7 +19,6 @@
     robot:
       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
-      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "Ubuntu 14.04 LTS Generic"
@@ -33,6 +32,8 @@
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"
       rancherIpAddress: "__rancher_ip_addr__"
+      config:
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
index 75c4f05..5d18a4d 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
@@ -20,7 +20,6 @@
     robot:
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "ubuntu-14-04-cloud-amd64"
@@ -34,6 +33,8 @@
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"
       rancherIpAddress: "__rancher_ip_addr__"
+      config:
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 48cc977..80c1e7f 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -19,7 +19,6 @@
     robot:
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "ubuntu-14-04-cloud-amd64"
@@ -33,6 +32,8 @@
       demoArtifactsVersion: "1.2.2"
       scriptVersion: "1.2.1"
       rancherIpAddress: "__rancher_ip_addr__"
+      config:
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"