diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
index cca6c0f..dacb243 100644
--- a/deployment/heat/onap-oom/env/gwu/onap-oom.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env
@@ -20,7 +20,7 @@
     robot:
       openStackKeyStoneUrl: "http://192.168.1.11:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackPassword: "${OS_PASSWORD}"
+      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "trusty"
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
index 96cf469..4991ab9 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env
@@ -20,7 +20,7 @@
     robot:
       openStackKeyStoneUrl: "http://10.145.122.118:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackPassword: "${OS_PASSWORD}"
+      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "trusty"
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index fa7cab7..ec3399b 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -19,7 +19,7 @@
     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
-      openStackPassword: "${OS_PASSWORD}"
+      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "Ubuntu 14.04 LTS Generic"
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 c37cf75..75c4f05 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,7 @@
     robot:
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackPassword: "${OS_PASSWORD}"
+      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "ubuntu-14-04-cloud-amd64"
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index c9cc2ba..48cc977 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -19,7 +19,7 @@
     robot:
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
-      openStackPassword: "${OS_PASSWORD}"
+      openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
       openStackTenantId: "${OS_PROJECT_ID}"
       openStackUserName: "${OS_USERNAME}"
       ubuntu14Image: "ubuntu-14-04-cloud-amd64"