diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index 1de7295..a80e699 100644
--- a/kubernetes/esr/Chart.yaml
+++ b/kubernetes/esr/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: esr
-version: v1.0.0
+version: 1.0.0
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 7b5e56b..32f2470 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -30,7 +30,7 @@
     repository: '@local'
     condition: appc.enabled
   - name: clamp
-    version: ~1.1.0
+    version: ~2.0.0
     repository: '@local'
     condition: clamp.enabled
   - name: cli
@@ -49,7 +49,7 @@
     repository: '@local'
     condition: dcaegen2.enabled
   - name: esr
-    version: ~1.1.0
+    version: ~1.0.0
     repository: '@local'
     condition: esr.enabled
   - name: log
diff --git a/kubernetes/onap/resources/environments/onap-demo.yaml b/kubernetes/onap/resources/environments/dev.yaml
similarity index 79%
rename from kubernetes/onap/resources/environments/onap-demo.yaml
rename to kubernetes/onap/resources/environments/dev.yaml
index 2748c31..8bbaa27 100644
--- a/kubernetes/onap/resources/environments/onap-demo.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -37,7 +37,7 @@
   # override default mount path root directory
   # referenced by persistent volumes and log files
   persistence:
-    mountPath: /dockerdata-nfs
+    mountPath: /dockerdata
 
   # flag to enable debugging - application support required
   debugEnabled: true
@@ -46,17 +46,52 @@
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
-consul:
+aaf:
+  enabled: false
+aai:
+  enabled: false
+appc:
+  enabled: false
+clamp:
+  enabled: true
+cli:
+  enabled: false
+consul: # Consul Health Check Monitoring
+  enabled: false
+dcaegen2:
+  enabled: false
+esr:
+  enabled: false
+log:
+  enabled: false
+message-router:
+  enabled: false
+mock:
+  enabled: false
+msb:
+  enabled: false
+multicloud:
+  enabled: false
+policy:
+  enabled: false
+portal:
+  enabled: false
+robot: # Robot Health Check
+  enabled: true
+sdc:
+  enabled: false
+sdnc:
+  enabled: false
+so: # Service Orchestrator
   enabled: true
 
-so:
-  enabled: true
   replicaCount: 1
+
   liveness:
     # necessary to disable liveness probe when setting breakpoints
     # in debugger so K8s doesn't restart unresponsive container
     enabled: true
-    
+
   # so server configuration
   config:
     # message router configuration
@@ -71,4 +106,12 @@
   # configure embedded mariadb
   mariadb:
     config:
-      mariadbRootPassword: password
\ No newline at end of file
+      mariadbRootPassword: password
+uui:
+  enabled: false
+vfc:
+  enabled: false
+vid:
+  enabled: false
+vnfsdk:
+  enabled: false
\ No newline at end of file
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index be4d132..0c3ff85 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -48,41 +48,41 @@
 # to customize the ONAP deployment.
 #################################################################
 aaf:
-  enabled: false
+  enabled: true
 aai:
-  enabled: false
+  enabled: true
 appc:
-  enabled: false
+  enabled: true
 clamp:
-  enabled: false
+  enabled: true
 cli:
-  enabled: false
+  enabled: true
 consul: # Consul Health Check Monitoring
-  enabled: false
+  enabled: true
 dcaegen2:
-  enabled: false
+  enabled: true
 esr:
-  enabled: false
+  enabled: true
 log:
-  enabled: false
+  enabled: true
 message-router:
-  enabled: false
+  enabled: true
 mock:
-  enabled: false
+  enabled: true
 msb:
-  enabled: false
+  enabled: true
 multicloud:
-  enabled: false
+  enabled: true
 policy:
-  enabled: false
+  enabled: true
 portal:
-  enabled: false
+  enabled: true
 robot: # Robot Health Check
   enabled: true
 sdc:
-  enabled: false
+  enabled: true
 sdnc:
-  enabled: false
+  enabled: true
 so: # Service Orchestrator
   enabled: true
 
@@ -109,10 +109,10 @@
     config:
       mariadbRootPassword: password
 uui:
-  enabled: false
+  enabled: true
 vfc:
-  enabled: false
+  enabled: true
 vid:
-  enabled: false
+  enabled: true
 vnfsdk:
-  enabled: false
+  enabled: true