diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index d973f90..c510eb4 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -16,20 +16,20 @@
     global:
       repository: 192.168.1.51:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://192.168.1.11:5000"
-        openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://192.168.1.11:5000"
+      openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "trusty"
+      ubuntu16Image: "xenial"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "trusty"
-        ubuntu16Image: "xenial"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://192.168.1.11:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://192.168.1.11:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 2dae282..18171f2 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.145.122.118:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.145.122.117:5000"
-        openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.145.122.117:5000"
+      openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "trusty"
+      ubuntu16Image: "xenial"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "trusty"
-        ubuntu16Image: "xenial"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.145.122.117:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.145.122.117:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index 59e0598..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -16,20 +16,20 @@
     global:
       repository: 192.168.31.204:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-        openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "Ubuntu 14.04 LTS Generic"
-        ubuntu16Image: "Ubuntu 16.04 LTS Generic"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index 59e0598..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -16,20 +16,20 @@
     global:
       repository: 192.168.31.204:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-        openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "Ubuntu 14.04 LTS Generic"
-        ubuntu16Image: "Ubuntu 16.04 LTS Generic"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
index eb0afc4..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
+++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
@@ -1,9 +1,7 @@
 parameters:
 
-  ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
 
-  lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
@@ -11,6 +9,27 @@
   k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-  public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
+
+  integration_override_yaml: >
+    global:
+      repository: 192.168.31.204:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "ubuntu-14-04-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"