diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index a54a798..bf015b7 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -23,6 +23,7 @@
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       flavor: large
       appcUsername: "appc@appc.onap.org"
       appcPassword: "demo123456!"
@@ -45,12 +46,14 @@
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
+      enabled: true
       so-openstack-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
@@ -62,10 +65,12 @@
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
     aai:
+      enabled: true
       liveness:
         initialDelaySeconds: 120
       aai-data-router:
@@ -78,6 +83,7 @@
         liveness:
           initialDelaySeconds: 120
     portal:
+      enabled: true
       global:
         portalHostName: "__portal_hostname__"
       portal-mariadb:
@@ -91,5 +97,49 @@
           dmaapBcHostName: "__portal_hostname__"
           msbHostName: "__portal_hostname__"
     vid:
+      enabled: true
       config:
         portalhost: "__portal_hostname__"
+
+    aaf:
+      enabled: true
+    cassandra:
+      enabled: true
+    clamp:
+      enabled: true
+    cli:
+      enabled: true
+    consul:
+      enabled: true
+    contrib:
+      enabled: true
+    dcaegen2:
+      enabled: true
+    dmaap:
+      enabled: true
+    esr:
+      enabled: true
+    log:
+      enabled: true
+    sniro-emulator:
+      enabled: true
+    oof:
+      enabled: true
+    msb:
+      enabled: true
+    multicloud:
+      enabled: true
+    nbi:
+      enabled: true
+    policy:
+      enabled: true
+    pomba:
+      enabled: true
+    sdc:
+      enabled: true
+    uui:
+      enabled: true
+    vfc:
+      enabled: true
+    vnfsdk:
+      enabled: true
\ No newline at end of file
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 4ded3df..a991ced 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
@@ -18,6 +18,7 @@
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -36,15 +37,18 @@
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
+      enabled: true
       config:
         openStackUserName: "${OS_USERNAME}"
         openStackKeyStoneUrl: "http://10.12.25.2:5000"
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 1
       config:
         enableClustering: false
     sdnc:
+      enabled: true
       replicaCount: 1
       config:
         enableClustering: false
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 850a471..792f2ca 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -23,6 +23,7 @@
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       flavor: large
       appcUsername: "appc@appc.onap.org"
       appcPassword: "demo123456!"
@@ -46,12 +47,14 @@
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
+      enabled: true
       so-openstack-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
@@ -63,10 +66,12 @@
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
     aai:
+      enabled: true
       liveness:
         initialDelaySeconds: 120
       aai-data-router:
@@ -79,6 +84,7 @@
         liveness:
           initialDelaySeconds: 120
     portal:
+      enabled: true
       global:
         portalHostName: "__portal_hostname__"
       portal-mariadb:
@@ -92,5 +98,49 @@
           dmaapBcHostName: "__portal_hostname__"
           msbHostName: "__portal_hostname__"
     vid:
+      enabled: true
       config:
         portalhost: "__portal_hostname__"
+
+    aaf:
+      enabled: true
+    cassandra:
+      enabled: true
+    clamp:
+      enabled: true
+    cli:
+      enabled: true
+    consul:
+      enabled: true
+    contrib:
+      enabled: true
+    dcaegen2:
+      enabled: true
+    dmaap:
+      enabled: true
+    esr:
+      enabled: true
+    log:
+      enabled: true
+    sniro-emulator:
+      enabled: true
+    oof:
+      enabled: true
+    msb:
+      enabled: true
+    multicloud:
+      enabled: true
+    nbi:
+      enabled: true
+    policy:
+      enabled: true
+    pomba:
+      enabled: true
+    sdc:
+      enabled: true
+    uui:
+      enabled: true
+    vfc:
+      enabled: true
+    vnfsdk:
+      enabled: true
\ No newline at end of file