diff --git a/contrail-analytics/Chart.yaml b/contrail-analytics/Chart.yaml
index deeaa14..8f8dd74 100644
--- a/contrail-analytics/Chart.yaml
+++ b/contrail-analytics/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-analytics
 description: Helm chart for Contrail Analytics
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"
diff --git a/contrail-analytics/templates/configmap-env.yaml b/contrail-analytics/templates/configmap-env.yaml
index e43e2e2..d0d154b 100644
--- a/contrail-analytics/templates/configmap-env.yaml
+++ b/contrail-analytics/templates/configmap-env.yaml
@@ -1,22 +1,25 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_analytics_env }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics
+  name: contrail-analytics-env
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
+{{- end }}
+
+{{- if .Values.manifests.configmap_analytics_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics-auth
+  name: contrail-analytics-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
@@ -29,16 +32,19 @@ data:
   KEYSTONE_AUTH_ADMIN_PORT: {{ .Values.endpoints.keystone.port.admin.default | quote }}
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
+{{- end }}
+
+{{- if .Values.manifests.configmap_analytics_rabbitmq }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-analytics-rabbitmq
+  name: contrail-analytics-rabbitmq
 data:
   RABBITMQ_NODES: {{ $rabbitmq_host }}
   RABBITMQ_PORT: {{ .Values.endpoints.rabbitmq.port.amqp.default | quote }}
   RABBITMQ_USER: {{ .Values.endpoints.rabbitmq.auth.username | quote }}
   RABBITMQ_PASSWORD: {{ .Values.endpoints.rabbitmq.auth.password | quote }}
-  RABBITMQ_USE_SSL: {{ .Values.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
+  RABBITMQ_USE_SSL: {{ .Values.global.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
   RABBITMQ_VHOST: {{ .Values.endpoints.rabbitmq.path | default "/" | quote }}
 {{- end }}
diff --git a/contrail-analytics/templates/daemonset-analytics.yaml b/contrail-analytics/templates/daemonset-analytics.yaml
index dd09630..00ee367 100644
--- a/contrail-analytics/templates/daemonset-analytics.yaml
+++ b/contrail-analytics/templates/daemonset-analytics.yaml
@@ -1,3 +1,4 @@
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- if .Values.manifests.daemonset_analytics }}
 {{- $context := . }}
 ---
@@ -30,18 +31,18 @@ spec:
 {{ tuple $context .Values.dependencies.analytics nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-analytics-api
-        image: {{ .Values.images.tags.analytics_api | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_api | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         ports:
         - name: api-port
-          containerPort: {{ .Values.contrail_env.ANALYTICS_API_PORT | default 8081 }}
+          containerPort: {{ .Values.global.contrail_env.ANALYTICS_API_PORT | default 8081 }}
         - name: introspect-port
-          containerPort: {{ .Values.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
+          containerPort: {{ .Values.global.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -50,15 +51,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-collector
-        image: {{ .Values.images.tags.contrail_collector | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_collector | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -67,15 +68,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-alarm-gen
-        image: {{ .Values.images.tags.analytics_alarm_gen | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_alarm_gen | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -84,13 +85,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-query-engine
-        image: {{ .Values.images.tags.analytics_query_engine | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_query_engine | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -99,15 +100,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-snmp-collector
-        image: {{ .Values.images.tags.analytics_snmp_collector | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.analytics_snmp_collector | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -116,15 +117,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-topology
-        image: {{ .Values.images.tags.contrail_topology | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_topology | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         - configMapRef:
-            name: configmap-analytics-rabbitmq
+            name: contrail-analytics-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -133,13 +134,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-analytics
       - name: contrail-analytics-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-analytics
+            name: contrail-analytics-env
         - configMapRef:
-            name: configmap-analytics-auth
+            name: contrail-analytics-keystone
         env:
         - name: NODE_TYPE
           value: analytics
diff --git a/contrail-analytics/templates/service-analytics-api.yaml b/contrail-analytics/templates/service-analytics-api.yaml
index d8574e9..55a71d8 100644
--- a/contrail-analytics/templates/service-analytics-api.yaml
+++ b/contrail-analytics/templates/service-analytics-api.yaml
@@ -8,10 +8,10 @@ spec:
   ports:
   - name: api
     port: {{ .Values.service.analytics_api_public_port | default 8081 }}
-    targetPort: {{ .Values.contrail_env.ANALYTICS_API_PORT | default 8081 }}
+    targetPort: {{ .Values.global.contrail_env.ANALYTICS_API_PORT | default 8081 }}
   - name: introspect
     port: {{ .Values.service.analytics_introspect_public_port | default 8090 }}
-    targetPort: {{ .Values.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
+    targetPort: {{ .Values.global.contrail_env.ANALYTICS_API_INTROSPECT_PORT | default 8090 }}
   selector:
 {{ tuple $context "opencontrail" "contrail-analytics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   type: ClusterIP
diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
index 57636ae..9700d00 100644
--- a/contrail-analytics/values.yaml
+++ b/contrail-analytics/values.yaml
@@ -1,14 +1,21 @@
-images:
-  tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
-    analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
-    contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
-    analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
-    analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
-    analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
-    contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  imagePullPolicy: "IfNotPresent"
+global:
+  images:
+    tags:
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
+      contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
+      analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
+      analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
+      analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
+      contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    imagePullPolicy: "IfNotPresent"
+
+  contrail_env:
+    CONTROLLER_NODES: 10.87.65.248
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 
 labels:
   analytics:
@@ -22,12 +29,6 @@ dependencies:
     - contrail-analyticsdb
     - contrail-config
 
-contrail_env:
-  CONTROLLER_NODES: 10.87.65.248
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-
 # typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
@@ -76,7 +77,9 @@ service:
   analytics_api_public_port: ""
 
 manifests:
-  configmap_env: true
+  configmap_analytics_env: true
+  configmap_analytics_keystone: true
+  configmap_analytics_rabbitmq: true
   daemonset_analytics: true
   service_analytics_api_server: true
   service_analytics_api_ingress: true
diff --git a/contrail-controller/Chart.yaml b/contrail-controller/Chart.yaml
index ac375f4..7e2b60e 100644
--- a/contrail-controller/Chart.yaml
+++ b/contrail-controller/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-controller
 description: Helm chart for Contrail controller
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"
diff --git a/contrail-controller/templates/configmap-env.yaml b/contrail-controller/templates/configmap-env.yaml
index 0b985e6..8790016 100644
--- a/contrail-controller/templates/configmap-env.yaml
+++ b/contrail-controller/templates/configmap-env.yaml
@@ -1,26 +1,28 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $metadata_host := tuple "nova_metadata" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_controller_env }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller
+  name: contrail-controller-env
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
   IPFABRIC_SERVICE_HOST: {{ $metadata_host }}
   IPFABRIC_SERVICE_PORT: {{ .Values.endpoints.nova_metadata.port.metadata.public | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_controller_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller-auth
+  name: contrail-controller-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
@@ -34,17 +36,19 @@ data:
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
   identityManager_apiVersion: '["v3"]'
+{{- end }}
+
+{{- if .Values.manifests.configmap_controller_rabbitmq }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-controller-rabbitmq
+  name: contrail-controller-rabbitmq
 data:
   RABBITMQ_NODES: {{ $rabbitmq_host }}
   RABBITMQ_PORT: {{ .Values.endpoints.rabbitmq.port.amqp.default | quote }}
   RABBITMQ_USER: {{ .Values.endpoints.rabbitmq.auth.username | quote }}
   RABBITMQ_PASSWORD: {{ .Values.endpoints.rabbitmq.auth.password | quote }}
-  RABBITMQ_USE_SSL: {{ .Values.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
+  RABBITMQ_USE_SSL: {{ .Values.global.contrail_env.RABBITMQ_USE_SSL | default "false" | quote }}
   RABBITMQ_VHOST: {{ .Values.endpoints.rabbitmq.path | default "/" | quote }}
-
 {{- end }}
diff --git a/contrail-controller/templates/daemonset-config.yaml b/contrail-controller/templates/daemonset-config.yaml
index f0ec2e0..706b502 100644
--- a/contrail-controller/templates/daemonset-config.yaml
+++ b/contrail-controller/templates/daemonset-config.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_config }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,20 +31,20 @@ spec:
 {{ tuple $context .Values.dependencies.config nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-config-api
-        image: {{ .Values.images.tags.config_api | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.config_api | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         ports:
         - name: api-port
-          containerPort: {{ .Values.contrail_env.CONFIG_API_PORT | default 8082 }}
+          containerPort: {{ .Values.global.contrail_env.CONFIG_API_PORT | default 8082 }}
         - name: introspect-port
-          containerPort: {{ .Values.contrail_env.CONFIG_API_INTROSPECT_PORT | default 8084 }}
+          containerPort: {{ .Values.global.contrail_env.CONFIG_API_INTROSPECT_PORT | default 8084 }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -52,15 +53,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-config
       - name: contrail-devicemgr
-        image: {{ .Values.images.tags.config_devicemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.config_devicemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -69,15 +70,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-config
       - name: contrail-schema-transformer
-        image: {{ .Values.images.tags.config_schema_transformer | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.config_schema_transformer | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -86,15 +87,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-config
       - name: contrail-svcmonitor
-        image: {{ .Values.images.tags.config_svcmonitor | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.config_svcmonitor | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -103,13 +104,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-config
       - name: contrail-config-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         env:
         - name: NODE_TYPE
           value: config
diff --git a/contrail-controller/templates/daemonset-control-only.yaml b/contrail-controller/templates/daemonset-control-only.yaml
index bd47289..842e03d 100644
--- a/contrail-controller/templates/daemonset-control-only.yaml
+++ b/contrail-controller/templates/daemonset-control-only.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_control_only }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,15 +31,15 @@ spec:
 {{ tuple $context .Values.dependencies.control_only nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-control
-        image: {{ .Values.images.tags.contrail_control | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_control | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
diff --git a/contrail-controller/templates/daemonset-control.yaml b/contrail-controller/templates/daemonset-control.yaml
index a61d1bb..9ff0331 100644
--- a/contrail-controller/templates/daemonset-control.yaml
+++ b/contrail-controller/templates/daemonset-control.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_control }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -31,15 +32,15 @@ spec:
 {{ tuple $context .Values.dependencies.control nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-control
-        image: {{ .Values.images.tags.contrail_control | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.contrail_control | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -48,15 +49,15 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-control
       - name: contrail-dns
-        image: {{ .Values.images.tags.control_dns | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.control_dns | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -65,17 +66,17 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-control
       - name: contrail-named
-        image: {{ .Values.images.tags.control_named | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.control_named | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         securityContext:
           privileged: true
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         - configMapRef:
-            name: configmap-controller-rabbitmq
+            name: contrail-controller-rabbitmq
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -84,13 +85,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-control
       - name: contrail-control-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         env:
         - name: NODE_TYPE
           value: control
diff --git a/contrail-controller/templates/daemonset-webui.yaml b/contrail-controller/templates/daemonset-webui.yaml
index 801cb8b..7ed3963 100644
--- a/contrail-controller/templates/daemonset-webui.yaml
+++ b/contrail-controller/templates/daemonset-webui.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_webui }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,18 +31,18 @@ spec:
 {{ tuple $context .Values.dependencies.webui nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-webui-middleware
-        image: {{ .Values.images.tags.webui_middleware | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.webui_middleware | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         ports:
         - name: http-port
-          containerPort: {{ .Values.contrail_env.WEBUI_HTTP_LISTEN_PORT | default 8080 }}
+          containerPort: {{ .Values.global.contrail_env.WEBUI_HTTP_LISTEN_PORT | default 8080 }}
         - name: https-port
-          containerPort: {{ .Values.contrail_env.WEBUI_HTTPS_LISTEN_PORT | default 8143 }}
+          containerPort: {{ .Values.global.contrail_env.WEBUI_HTTPS_LISTEN_PORT | default 8143 }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
@@ -50,13 +51,13 @@ spec:
         - mountPath: /var/crashes
           name: var-crashes-webui
       - name: contrail-webui
-        image: {{ .Values.images.tags.webui | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.webui | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-controller
+            name: contrail-controller-env
         - configMapRef:
-            name: configmap-controller-auth
+            name: contrail-controller-keystone
         volumeMounts:
         - mountPath: /var/log/contrail/
           name: contrail-log
diff --git a/contrail-controller/templates/service-config-api.yaml b/contrail-controller/templates/service-config-api.yaml
index c642838..1375645 100644
--- a/contrail-controller/templates/service-config-api.yaml
+++ b/contrail-controller/templates/service-config-api.yaml
@@ -8,10 +8,10 @@ spec:
   ports:
   - name: api
     port: {{ .Values.service.config_api_public_port | default 8082 }}
-    targetPort: {{ .Values.contrail_env.CONFIG_API_PORT | default 8082 }}
+    targetPort: {{ .Values.global.contrail_env.CONFIG_API_PORT | default 8082 }}
   - name: introspect
     port: {{ .Values.service.config_introspect_public_port | default 8084 }}
-    targetPort: {{ .Values.contrail_env.CONFIG_API_INTROSPECT_PORT | default 8084 }}
+    targetPort: {{ .Values.global.contrail_env.CONFIG_API_INTROSPECT_PORT | default 8084 }}
   selector:
 {{ tuple $context "opencontrail" "contrail-config" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   type: ClusterIP
diff --git a/contrail-controller/templates/service-web-controller.yaml b/contrail-controller/templates/service-web-controller.yaml
index 745f558..b6893e8 100644
--- a/contrail-controller/templates/service-web-controller.yaml
+++ b/contrail-controller/templates/service-web-controller.yaml
@@ -8,10 +8,10 @@ spec:
   ports:
   - name: http
     port: {{ .Values.service.webui_http_public_port | default 8080 }}
-    targetPort: {{ .Values.contrail_env.WEBUI_HTTP_LISTEN_PORT | default 8080 }}
+    targetPort: {{ .Values.global.contrail_env.WEBUI_HTTP_LISTEN_PORT | default 8080 }}
   - name: https
     port: {{ .Values.service.webui_https_public_port | default 8143 }}
-    targetPort: {{ .Values.contrail_env.WEBUI_HTTPS_LISTEN_PORT | default 8143 }}
+    targetPort: {{ .Values.global.contrail_env.WEBUI_HTTPS_LISTEN_PORT | default 8143 }}
   selector:
 {{ tuple $context "opencontrail" "contrail-webui" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   type: ClusterIP
diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml
index 9e5490b..ab8d5be 100644
--- a/contrail-controller/values.yaml
+++ b/contrail-controller/values.yaml
@@ -1,17 +1,24 @@
-images:
-  tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
-    contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:ocata-master-17"
-    control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:ocata-master-17"
-    control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:ocata-master-17"
-    config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:ocata-master-17"
-    config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:ocata-master-17"
-    config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:ocata-master-17"
-    config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:ocata-master-17"
-    webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:ocata-master-17"
-    webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:ocata-master-17"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  imagePullPolicy: "IfNotPresent"
+global:
+  images:
+    tags:
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:ocata-master-17"
+      control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:ocata-master-17"
+      control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:ocata-master-17"
+      config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:ocata-master-17"
+      config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:ocata-master-17"
+      config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:ocata-master-17"
+      config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:ocata-master-17"
+      webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:ocata-master-17"
+      webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    imagePullPolicy: "IfNotPresent"
+
+  contrail_env:
+    CONTROLLER_NODES: 10.87.65.248
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 
 labels:
   control:
@@ -39,12 +46,6 @@ dependencies:
     - contrail-config
     - contrail-redis
 
-contrail_env:
-  CONTROLLER_NODES: 10.87.65.248
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-
 
 # typically overriden by environmental
 # values, but should include all endpoints
@@ -109,7 +110,9 @@ service:
   config_api_public_port: ""
 
 manifests:
-  configmap_env: true
+  configmap_controller_env: true
+  configmap_controller_keystone: true
+  configmap_controller_rabbitmq: true
   daemonset_config: true
   daemonset_control: true
   daemonset_control_only: false
diff --git a/contrail-thirdparty/Chart.yaml b/contrail-thirdparty/Chart.yaml
index 8006ba8..42ce8f4 100644
--- a/contrail-thirdparty/Chart.yaml
+++ b/contrail-thirdparty/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-thirdparty
 description: Helm chart for Contrail thirdparty components
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"
diff --git a/contrail-thirdparty/templates/configmap-env.yaml b/contrail-thirdparty/templates/configmap-env.yaml
index 2b5225a..13836b0 100644
--- a/contrail-thirdparty/templates/configmap-env.yaml
+++ b/contrail-thirdparty/templates/configmap-env.yaml
@@ -1,44 +1,50 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
-{{- $configdb_nodes := .Values.contrail_env.CONFIG_NODES | default .Values.contrail_env.CONTROLLER_NODES }}
-{{- $analyticsdb_nodes := .Values.contrail_env.ANALYTICS_NODES | default .Values.contrail_env.CONTROLLER_NODES }}
+{{- $configdb_nodes := .Values.global.contrail_env.CONFIG_NODES | default .Values.global.contrail_env.CONTROLLER_NODES }}
+{{- $analyticsdb_nodes := .Values.global.contrail_env.ANALYTICS_NODES | default .Values.global.contrail_env.CONTROLLER_NODES }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_analytics_zookeeper }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: contrail-analytics-zookeeper
 data:
-  ZOOKEEPER_PORT: {{ .Values.contrail_env.ZOOKEEPER_ANALYTICS_PORT | default 2182 | quote }}
+  ZOOKEEPER_PORT: {{ .Values.global.contrail_env.ZOOKEEPER_ANALYTICS_PORT | default 2182 | quote }}
   ZOOKEEPER_PORTS: "4888:5888"
-  ZOOKEEPER_NODES: {{ .Values.contrail_env.ZOOKEEPER_ANALYTICS_NODES | default .Values.contrail_env.ANALYTICSDB_NODES | default $analyticsdb_nodes | quote }}
+  ZOOKEEPER_NODES: {{ .Values.global.contrail_env.ZOOKEEPER_ANALYTICS_NODES | default .Values.global.contrail_env.ANALYTICSDB_NODES | default $analyticsdb_nodes | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_config_zookeeper }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: contrail-config-zookeeper
 data:
-  ZOOKEEPER_PORT: {{ .Values.contrail_env.ZOOKEEPER_PORT | default 2181 | quote }}
+  ZOOKEEPER_PORT: {{ .Values.global.contrail_env.ZOOKEEPER_PORT | default 2181 | quote }}
   ZOOKEEPER_PORTS: "2888:3888"
-  ZOOKEEPER_NODES: {{ .Values.contrail_env.ZOOKEEPER_NODES | default .Values.contrail_env.CONFIGDB_NODES | default $configdb_nodes | quote }}
+  ZOOKEEPER_NODES: {{ .Values.global.contrail_env.ZOOKEEPER_NODES | default .Values.global.contrail_env.CONFIGDB_NODES | default $configdb_nodes | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_thirdparty_env }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: contrail-thirdparty
+  name: contrail-thirdparty-env
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_thirdparty_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: contrail-thirdparty-auth
+  name: contrail-thirdparty-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
@@ -51,7 +57,9 @@ data:
   KEYSTONE_AUTH_ADMIN_PORT: {{ .Values.endpoints.keystone.port.admin.default | quote }}
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_configdb }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -59,28 +67,29 @@ metadata:
   name: contrail-configdb
 data:
   # TODO: fix seeds and listen address
-  CASSANDRA_SEEDS: {{ .Values.contrail_env.CONFIGDB_NODES | default $configdb_nodes | quote }}
+  CASSANDRA_SEEDS: {{ .Values.global.contrail_env.CONFIGDB_NODES | default $configdb_nodes | quote }}
   CASSANDRA_CLUSTER_NAME: ContrailConfigDB
   CASSANDRA_START_RPC: "true"
-  CASSANDRA_PORT: {{ .Values.contrail_env.CONFIGDB_PORT | default 9161 | quote }}
-  CASSANDRA_CQL_PORT: {{ .Values.contrail_env.CONFIGDB_CQL_PORT | default 9041 | quote }}
-  CASSANDRA_SSL_STORAGE_PORT: {{ .Values.contrail_env.CONFIGDB_SSL_STORAGE_PORT | default 7011 | quote }}
-  CASSANDRA_STORAGE_PORT: {{ .Values.contrail_env.CONFIGDB_STORAGE_PORT | default 7010 | quote  }}
-  CASSANDRA_JMX_LOCAL_PORT: {{ .Values.contrail_env.JMX_LOCAL_PORT | default 7200 | quote }}
+  CASSANDRA_PORT: {{ .Values.global.contrail_env.CONFIGDB_PORT | default 9161 | quote }}
+  CASSANDRA_CQL_PORT: {{ .Values.global.contrail_env.CONFIGDB_CQL_PORT | default 9041 | quote }}
+  CASSANDRA_SSL_STORAGE_PORT: {{ .Values.global.contrail_env.CONFIGDB_SSL_STORAGE_PORT | default 7011 | quote }}
+  CASSANDRA_STORAGE_PORT: {{ .Values.global.contrail_env.CONFIGDB_STORAGE_PORT | default 7010 | quote  }}
+  CASSANDRA_JMX_LOCAL_PORT: {{ .Values.global.contrail_env.JMX_LOCAL_PORT | default 7200 | quote }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_analyticsdb }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: contrail-analyticsdb
 data:
-  CASSANDRA_SEEDS: {{ .Values.contrail_env.ANALYTICSDB_NODES | default $analyticsdb_nodes | quote  }}
+  CASSANDRA_SEEDS: {{ .Values.global.contrail_env.ANALYTICSDB_NODES | default $analyticsdb_nodes | quote  }}
   CASSANDRA_CLUSTER_NAME: ContrailAnalyticsDB
   CASSANDRA_START_RPC: "true"
-  CASSANDRA_PORT: {{ .Values.contrail_env.CONFIGDB_PORT | default 9160 | quote }}
-  CASSANDRA_CQL_PORT: {{ .Values.contrail_env.CONFIGDB_CQL_PORT | default 9042 | quote }}
-  CASSANDRA_SSL_STORAGE_PORT: {{ .Values.contrail_env.CONFIGDB_SSL_STORAGE_PORT | default 7001 | quote }}
-  CASSANDRA_STORAGE_PORT: {{ .Values.contrail_env.CONFIGDB_STORAGE_PORT | default 7000 | quote  }}
-  CASSANDRA_JMX_LOCAL_PORT: {{ .Values.contrail_env.JMX_LOCAL_PORT | default 7100 | quote }}
-
+  CASSANDRA_PORT: {{ .Values.global.contrail_env.CONFIGDB_PORT | default 9160 | quote }}
+  CASSANDRA_CQL_PORT: {{ .Values.global.contrail_env.CONFIGDB_CQL_PORT | default 9042 | quote }}
+  CASSANDRA_SSL_STORAGE_PORT: {{ .Values.global.contrail_env.CONFIGDB_SSL_STORAGE_PORT | default 7001 | quote }}
+  CASSANDRA_STORAGE_PORT: {{ .Values.global.contrail_env.CONFIGDB_STORAGE_PORT | default 7000 | quote  }}
+  CASSANDRA_JMX_LOCAL_PORT: {{ .Values.global.contrail_env.JMX_LOCAL_PORT | default 7100 | quote }}
 {{- end }}
diff --git a/contrail-thirdparty/templates/daemonset-analytics-zookeeper.yaml b/contrail-thirdparty/templates/daemonset-analytics-zookeeper.yaml
index 4b457ab..b66be79 100644
--- a/contrail-thirdparty/templates/daemonset-analytics-zookeeper.yaml
+++ b/contrail-thirdparty/templates/daemonset-analytics-zookeeper.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_analytics_zookeeper }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,8 +31,8 @@ spec:
 {{ tuple $context .Values.dependencies.analytics_zookeeper nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: zookeeper
-        image: {{ .Values.images.tags.zookeeper | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.zookeeper | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
             name: contrail-analytics-zookeeper
diff --git a/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml b/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml
index b7b62a0..2cf060d 100644
--- a/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml
+++ b/contrail-thirdparty/templates/daemonset-analyticsdb-nodemgr.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_analyticsdb_nodemgr }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,13 +31,13 @@ spec:
 {{ tuple $context .Values.dependencies.analyticsdb_nodemgr nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-analyticsdb-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: contrail-thirdparty-auth
+            name: contrail-thirdparty-env
         - configMapRef:
-            name: contrail-thirdparty
+            name: contrail-thirdparty-keystone
         env:
         - name: NODE_TYPE
           value: database
diff --git a/contrail-thirdparty/templates/daemonset-analyticsdb.yaml b/contrail-thirdparty/templates/daemonset-analyticsdb.yaml
index 5ceb3c7..3c17d36 100644
--- a/contrail-thirdparty/templates/daemonset-analyticsdb.yaml
+++ b/contrail-thirdparty/templates/daemonset-analyticsdb.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_analyticsdb }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,13 +31,13 @@ spec:
 {{ tuple $context .Values.dependencies.analyticsdb nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-analyticsdb
-        image: {{ .Values.images.tags.cassandra | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.cassandra | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
             name: contrail-analyticsdb
         - configMapRef:
-            name: contrail-thirdparty
+            name: contrail-thirdparty-env
         volumeMounts:
         - mountPath: /var/lib/cassandra
           name: analyticsdb-data
diff --git a/contrail-thirdparty/templates/daemonset-config-zookeeper.yaml b/contrail-thirdparty/templates/daemonset-config-zookeeper.yaml
index 28006a1..b57b19b 100644
--- a/contrail-thirdparty/templates/daemonset-config-zookeeper.yaml
+++ b/contrail-thirdparty/templates/daemonset-config-zookeeper.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_config_zookeeper }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,8 +31,8 @@ spec:
 {{ tuple $context .Values.dependencies.config_zookeeper nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: zookeeper
-        image: {{ .Values.images.tags.zookeeper | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.zookeeper | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
             name: contrail-config-zookeeper
diff --git a/contrail-thirdparty/templates/daemonset-configdb.yaml b/contrail-thirdparty/templates/daemonset-configdb.yaml
index e507d88..1c83ecc 100644
--- a/contrail-thirdparty/templates/daemonset-configdb.yaml
+++ b/contrail-thirdparty/templates/daemonset-configdb.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_configdb }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,13 +31,13 @@ spec:
 {{ tuple $context .Values.dependencies.configdb nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: contrail-configdb
-        image: {{ .Values.images.tags.cassandra | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.cassandra | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
             name: contrail-configdb
         - configMapRef:
-            name: contrail-thirdparty
+            name: contrail-thirdparty-env
         volumeMounts:
         - mountPath: /var/lib/cassandra
           name: configdb-data
diff --git a/contrail-thirdparty/templates/daemonset-kafka.yaml b/contrail-thirdparty/templates/daemonset-kafka.yaml
index 8c91166..35bd0a8 100644
--- a/contrail-thirdparty/templates/daemonset-kafka.yaml
+++ b/contrail-thirdparty/templates/daemonset-kafka.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_kafka }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,9 +31,9 @@ spec:
 {{ tuple $context .Values.dependencies.kafka nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: kafka
-        image: {{ .Values.images.tags.kafka | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.kafka | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: contrail-thirdparty
+            name: contrail-thirdparty-env
 {{- end }}
diff --git a/contrail-thirdparty/templates/daemonset-redis.yaml b/contrail-thirdparty/templates/daemonset-redis.yaml
index 591ab21..c153b56 100644
--- a/contrail-thirdparty/templates/daemonset-redis.yaml
+++ b/contrail-thirdparty/templates/daemonset-redis.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.manifests.daemonset_redis }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 ---
 apiVersion: extensions/v1beta1
@@ -30,6 +31,6 @@ spec:
 {{ tuple $context .Values.dependencies.redis nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: redis
-        image: {{ .Values.images.tags.redis | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.redis | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
 {{- end }}
diff --git a/contrail-thirdparty/values.yaml b/contrail-thirdparty/values.yaml
index 35cca54..d4cf609 100644
--- a/contrail-thirdparty/values.yaml
+++ b/contrail-thirdparty/values.yaml
@@ -1,11 +1,18 @@
-images:
-  tags:
-    kafka: "docker.io/opencontrailnightly/contrail-external-kafka:ocata-master-17"
-    cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:ocata-master-17"
-    redis: "redis:4.0.2"
-    zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:ocata-master-17"
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+global:
+  images:
+    tags:
+      kafka: "docker.io/opencontrailnightly/contrail-external-kafka:ocata-master-17"
+      cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:ocata-master-17"
+      redis: "redis:4.0.2"
+      zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:ocata-master-17"
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+
+  contrail_env:
+    CONTROLLER_NODES: 10.87.65.248
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 
 labels:
   configdb:
@@ -45,13 +52,6 @@ dependencies:
     daemonset:
     - contrail-analyticsdb
 
-
-contrail_env:
-  CONTROLLER_NODES: 10.87.65.248
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-
 endpoints:
   cluster_domain_suffix: cluster.local
   keystone:
@@ -78,7 +78,12 @@ endpoints:
     namespace: openstack
 
 manifests:
-  configmap_env: true
+  configmap_analytics_zookeeper: true
+  configmap_config_zookeeper: true
+  configmap_thirdparty_env: true
+  configmap_thirdparty_keystone: true
+  configmap_configdb: true
+  configmap_analyticsdb: true
   daemonset_configdb: true
   daemonset_analyticsdb: true
   daemonset_redis: true
diff --git a/contrail-vrouter/Chart.yaml b/contrail-vrouter/Chart.yaml
index cbfa6da..1b1333e 100644
--- a/contrail-vrouter/Chart.yaml
+++ b/contrail-vrouter/Chart.yaml
@@ -3,7 +3,7 @@ name: contrail-vrouter
 description: Helm chart for Contrail vrouter
 version: 0.1.0
 appVersion: Contrail 5.0.0
-home: https://github.com/Juniper/contrail-docker/
+home: https://github.com/Juniper/contrail-helm-deployer/
 sources:
   - https://github.com/Juniper/contrail-controller/
 tillerVersion: ">=2.4.0"
diff --git a/contrail-vrouter/templates/configmap-env.yaml b/contrail-vrouter/templates/configmap-env.yaml
index 733a7cd..50fbb36 100644
--- a/contrail-vrouter/templates/configmap-env.yaml
+++ b/contrail-vrouter/templates/configmap-env.yaml
@@ -1,38 +1,42 @@
-{{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
+{{- if .Values.manifests.configmap_vrouter_kernel }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-vrouter-kernel
+  name: contrail-vrouter-kernel
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
-  {{- range $key, $value := .Values.contrail_env_vrouter_kernel }}
+  {{- range $key, $value := .Values.global.contrail_env_vrouter_kernel }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_vrouter_dpdk }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-vrouter-dpdk
+  name: contrail-vrouter-dpdk
 data:
-  {{- range $key, $value := .Values.contrail_env }}
+  {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
-  {{- range $key, $value := .Values.contrail_env_vrouter_dpdk }}
+  {{- range $key, $value := .Values.global.contrail_env_vrouter_dpdk }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
+{{- end }}
 
+{{- if .Values.manifests.configmap_vrouter_keystone }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap-vrouter-auth
+  name: contrail-vrouter-keystone
 data:
   KEYSTONE_AUTH_ADMIN_USER: {{ .Values.endpoints.keystone.auth.username }}
   KEYSTONE_AUTH_ADMIN_TENANT: {{ .Values.endpoints.keystone.auth.project_name }}
diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
index 7d536c2..1241e31 100644
--- a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
+++ b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.manifests.daemonset_dpdk }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 # host_os is a mandatory field
-{{- $_ := required ".Values.node.host_os must be specified, valid values are ubuntu, centos" .Values.node.host_os }}
-{{- $host_os := .Values.node.host_os }}
+{{- $_ := required ".Values.global.node.host_os must be specified, valid values are ubuntu, centos" .Values.global.node.host_os }}
+{{- $host_os := .Values.global.node.host_os }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -33,15 +34,15 @@ spec:
       initContainers:
 {{ tuple $context .Values.dependencies.vrouter_agent_dpdk nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: contrail-init-dpdk
-          image: {{ .Values.images.tags.vrouter_init_dpdk | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.vrouter_init_dpdk | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-dpdk
+              name: contrail-vrouter-dpdk
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
           - mountPath: /lib/modules
             name: lib-modules
@@ -51,19 +52,19 @@ spec:
             name: os-release
           - mountPath: /etc/lsb-release
             name: lsb-release
-          - mountPath: {{ .Values.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
             name: hugepages
       containers:
         - name: contrail-vrouter-dpdk
-          image: {{ .Values.images.tags.vrouter_dpdk | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.vrouter_dpdk | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-dpdk
+              name: contrail-vrouter-dpdk
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
           - mountPath: /etc/
             name: mount-etc
@@ -79,20 +80,20 @@ spec:
             name: os-release
           - mountPath: /etc/lsb-release
             name: lsb-release
-          - mountPath: {{ .Values.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
             name: hugepages
           - mountPath: /var/crashes
             name: var-crashes-vrouter
         - name: contrail-dpdk-watchdog
-          image: {{ .Values.images.tags.dpdk_watchdog | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.dpdk_watchdog | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-dpdk
+              name: contrail-vrouter-dpdk
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
 {{- if eq $host_os "centos"}}
           - mountPath: /etc/sysconfig/network-scripts
@@ -105,15 +106,15 @@ spec:
           - mountPath: /host/bin
             name: host-bin
         - name: contrail-vrouter-dpdk-agent
-          image: {{ .Values.images.tags.vrouter_agent | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.vrouter_agent | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-dpdk
+              name: contrail-vrouter-dpdk
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
           - mountPath: /var/lib/contrail/
             name: var-lib-contrail
@@ -123,7 +124,7 @@ spec:
             name: etc-contrail
           - mountPath: /var/run/
             name: var-run
-          - mountPath: {{ .Values.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
             name: hugepages
           - mountPath: /var/crashes
             name: var-crashes-vrouter
@@ -134,13 +135,13 @@ spec:
             name: network-scripts
 {{- end }}
         - name: contrail-agent-nodemgr
-          image: {{ .Values.images.tags.nodemgr | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.nodemgr | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-dpdk
+              name: contrail-vrouter-dpdk
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           env:
           - name: NODE_TYPE
             value: vrouter
@@ -198,7 +199,7 @@ spec:
           path: /etc
       - name: hugepages
         hostPath:
-          path: {{ .Values.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          path: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
       - name: var-crashes-vrouter
         hostPath:
           path: /var/crashes/contrail/vrouter
diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml
index 791d9b6..e15b5c6 100644
--- a/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml
+++ b/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.manifests.daemonset_kernel }}
+{{- $_ := set .Values "images" .Values.global.images }}
 {{- $context := . }}
 # host_os is a mandatory field
-{{- $_ := required ".Values.node.host_os must be specified, valid values are ubuntu, centos" .Values.node.host_os }}
-{{- $host_os := .Values.node.host_os }}
+{{- $_ := required ".Values.global.node.host_os must be specified, valid values are ubuntu, centos" .Values.global.node.host_os }}
+{{- $host_os := .Values.global.node.host_os }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -35,15 +36,15 @@ spec:
 {{ tuple $context .Values.dependencies.vrouter_agent_kernel nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if eq $host_os "ubuntu"}}
         - name: contrail-init-kernel
-          image: {{ .Values.images.tags.build_driver_init | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.build_driver_init | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
-              name: configmap-vrouter-kernel
+              name: contrail-vrouter-kernel
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
           - mountPath: /usr/src
             name: usr-src
@@ -53,15 +54,15 @@ spec:
             name: host-bin
 {{- else if $host_os "centos" }}
         - name: contrail-init-kernel
-          image: {{ .Values.images.tags.vrouter_init_kernel | quote }}
-          imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+          image: {{ .Values.global.images.tags.vrouter_init_kernel | quote }}
+          imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
             privileged: true
           envFrom:
           - configMapRef:
               name: configmap-vrouter
           - configMapRef:
-              name: configmap-vrouter-auth
+              name: contrail-vrouter-keystone
           volumeMounts:
           - mountPath: /etc/sysconfig/network-scripts
             name: network-scripts
@@ -70,15 +71,15 @@ spec:
 {{- end }}
       containers:
       - name: contrail-vrouter-kernel-agent
-        image: {{ .Values.images.tags.vrouter_agent | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.vrouter_agent | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         securityContext:
           privileged: true
         envFrom:
         - configMapRef:
-            name: configmap-vrouter-kernel
+            name: contrail-vrouter-kernel
         - configMapRef:
-            name: configmap-vrouter-auth
+            name: contrail-vrouter-keystone
         volumeMounts:
 {{- if eq $host_os "centos"}}
         - mountPath: /etc/sysconfig/network-scripts
@@ -95,13 +96,13 @@ spec:
         - mountPath: /host/bin
           name: host-bin
       - name: contrail-agent-nodemgr
-        image: {{ .Values.images.tags.nodemgr | quote }}
-        imagePullPolicy: {{ default "" .Values.images.imagePullPolicy | quote }}
+        image: {{ .Values.global.images.tags.nodemgr | quote }}
+        imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: configmap-vrouter-kernel
+            name: contrail-vrouter-kernel
         - configMapRef:
-            name: configmap-vrouter-auth
+            name: contrail-vrouter-keystone
         env:
         - name: NODE_TYPE
           value: vrouter
diff --git a/contrail-vrouter/values.yaml b/contrail-vrouter/values.yaml
index fd48226..352b8f3 100644
--- a/contrail-vrouter/values.yaml
+++ b/contrail-vrouter/values.yaml
@@ -1,14 +1,42 @@
-images:
-  tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
-    build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:ocata-master-17"
-    vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:ocata-master-17"
-    vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:ocata-master-17"
-    vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:ocata-master-17"
-    vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:ocata-master-17"
-    dpdk_watchdog: "docker.io/opencontrailnightly/contrail-vrouter-net-watchdog:ocata-master-17"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  imagePullPolicy: "IfNotPresent"
+global:
+  images:
+    tags:
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:ocata-master-17"
+      vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:ocata-master-17"
+      vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:ocata-master-17"
+      vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:ocata-master-17"
+      vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:ocata-master-17"
+      dpdk_watchdog: "docker.io/opencontrailnightly/contrail-vrouter-net-watchdog:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    imagePullPolicy: "IfNotPresent"
+
+  # common section for all vrouter variants
+  # this section is commonized with other Contrails' services
+  contrail_env:
+    CONTROLLER_NODES: 10.87.65.248
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
+    # this value should be the same as nova/conf.nova.neutron.metadata_proxy_shared_secret
+    METADATA_PROXY_SECRET: password
+    #CONTROL_DATA_NET_LIST: 8.0.0.0/24
+    #VROUTER_GATEWAY: 8.0.0.254
+
+  # section of vrouter template for kernel mode
+  contrail_env_vrouter_kernel:
+    #AGENT_MODE: nic
+
+  # section of vrouter template for dpdk mode
+  contrail_env_vrouter_dpdk:
+    #CPU_CORE_MASK: "0xf"
+    #DPDK_UIO_DRIVER: uio_pci_generic
+    #HUGE_PAGES: 32000
+    #AGENT_MODE: dpdk
+    #HUGE_PAGES_DIR: /hugepages
+
+  node:
+    host_os: ubuntu
 
 labels:
   vrouter_agent_kernel:
@@ -28,34 +56,6 @@ dependencies:
     - contrail-config
     - contrail-control
 
-# common section for all vrouter variants
-# this section is commonized with other Contrails' services
-contrail_env:
-  CONTROLLER_NODES: 10.87.65.248
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-  # this value should be the same as nova/conf.nova.neutron.metadata_proxy_shared_secret
-  METADATA_PROXY_SECRET: password
-  #CONTROL_DATA_NET_LIST: 8.0.0.0/24
-  #VROUTER_GATEWAY: 8.0.0.254
-
-# section of vrouter template for kernel mode
-contrail_env_vrouter_kernel:
-  #AGENT_MODE: nic
-
-# section of vrouter template for dpdk mode
-contrail_env_vrouter_dpdk:
-  #CPU_CORE_MASK: "0xf"
-  #DPDK_UIO_DRIVER: uio_pci_generic
-  #HUGE_PAGES: 32000
-  #AGENT_MODE: dpdk
-  #HUGE_PAGES_DIR: /hugepages
-
-
-node:
-  host_os: ubuntu
-
 # typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
@@ -85,6 +85,8 @@ endpoints:
     namespace: openstack
 
 manifests:
-  configmap_env: true
+  configmap_vrouter_kernel: true
+  configmap_vrouter_keystone: true
+  configmap_vrouter_dpdk: false
   daemonset_kernel: true
   daemonset_dpdk: false
diff --git a/contrail/Chart.yaml b/contrail/Chart.yaml
new file mode 100644
index 0000000..b662fea
--- /dev/null
+++ b/contrail/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+name: contrail
+description: Helm chart for Contrail SDN
+version: 0.1.0
+appVersion: Contrail 5.0.0
+home: https://github.com/Juniper/contrail-helm-deployer/
+sources:
+  - https://github.com/Juniper/contrail-controller/
+tillerVersion: ">=2.4.0"
+keywords:
+  - Contrail
+  - SDN
diff --git a/contrail/requirements.yaml b/contrail/requirements.yaml
new file mode 100644
index 0000000..53535bf
--- /dev/null
+++ b/contrail/requirements.yaml
@@ -0,0 +1,16 @@
+dependencies:
+  - name: helm-toolkit-contrail
+    repository: http://localhost:8879/charts
+    version: 0.1.0
+  - name: contrail-thirdparty
+    repository: http://localhost:8879/charts
+    version: 0.1.0
+  - name: contrail-controller
+    repository: http://localhost:8879/charts
+    version: 0.1.0
+  - name: contrail-analytics
+    repository: http://localhost:8879/charts
+    version: 0.1.0
+  - name: contrail-vrouter
+    repository: http://localhost:8879/charts
+    version: 0.1.0
diff --git a/contrail/values.yaml b/contrail/values.yaml
new file mode 100644
index 0000000..87c7862
--- /dev/null
+++ b/contrail/values.yaml
@@ -0,0 +1,67 @@
+# GLOBAL variables: which can be consumed by all charts
+# images, contrail_env, contrail_env_vrouter_dpdk, contrail_env_vrouter_kernel
+global:
+  # section to configure images for all containers
+  images:
+    tags:
+      kafka: "docker.io/opencontrailnightly/contrail-external-kafka:ocata-master-17"
+      cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:ocata-master-17"
+      redis: "redis:4.0.2"
+      zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:ocata-master-17"
+      contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:ocata-master-17"
+      control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:ocata-master-17"
+      control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:ocata-master-17"
+      config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:ocata-master-17"
+      config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:ocata-master-17"
+      config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:ocata-master-17"
+      config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:ocata-master-17"
+      webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:ocata-master-17"
+      webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:ocata-master-17"
+      analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
+      contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
+      analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
+      analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
+      analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
+      contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
+      build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:ocata-master-17"
+      vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:ocata-master-17"
+      vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:ocata-master-17"
+      vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:ocata-master-17"
+      vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:ocata-master-17"
+      dpdk_watchdog: "docker.io/opencontrailnightly/contrail-vrouter-net-watchdog:ocata-master-17"
+      nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+      dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    imagePullPolicy: "IfNotPresent"
+
+
+  # contrail_env section for all containers
+  contrail_env:
+    CONTROLLER_NODES: 6.6.6.6
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
+    CONTROL_DATA_NET_LIST: 6.6.6.0/24
+    VROUTER_GATEWAY: 6.6.6.1
+
+  # section of vrouter template for kernel mode
+  contrail_env_vrouter_kernel:
+    #AGENT_MODE: nic
+
+  # section of vrouter template for dpdk mode
+  contrail_env_vrouter_dpdk:
+    #CPU_CORE_MASK: "0xf"
+    #DPDK_UIO_DRIVER: uio_pci_generic
+    #HUGE_PAGES: 32000
+    #AGENT_MODE: dpdk
+    #HUGE_PAGES_DIR: /hugepages
+
+  node:
+    host_os: ubuntu
+
+# Chart level variables like manifests, labels which are local to subchart
+# Can be updated from the parent chart like below
+# Example of overriding values of subchart, where contrail-vrouter is name of the subchart
+contrail-vrouter:
+  manifests:
+    configmap_vrouter_dpdk: false
+    daemonset_dpdk: false
diff --git a/doc/contrail-osh-aio-install.md b/doc/contrail-osh-aio-install.md
index 980553d..fbae3c6 100644
--- a/doc/contrail-osh-aio-install.md
+++ b/doc/contrail-osh-aio-install.md
@@ -95,23 +95,19 @@ Install below packages on your setup
 
   kubectl replace -f ${CHD_PATH}/rbac/cluster-admin.yaml
 
-  helm install --name contrail-thirdparty ${CHD_PATH}/contrail-thirdparty \
-  --namespace=contrail --set contrail_env.CONTROLLER_NODES=172.17.0.1
-
-  helm install --name contrail-controller ${CHD_PATH}/contrail-controller \
-  --namespace=contrail --set contrail_env.CONTROLLER_NODES=172.17.0.1 \
-  --set contrail_env.CONTROL_NODES=${CONTROL_NODES}
-
-  helm install --name contrail-analytics ${CHD_PATH}/contrail-analytics \
-  --namespace=contrail --set contrail_env.CONTROLLER_NODES=172.17.0.1
-
-  # Edit contrail-vrouter/values.yaml and make sure that images.tags.vrouter_kernel_init is right. Image tag name will be different depending upon your linux. Also set the conf.host_os to ubuntu or centos depending on your system
-
-  helm install --name contrail-vrouter ${CHD_PATH}/contrail-vrouter \
-  --namespace=contrail --set contrail_env.CONTROLLER_NODES=172.17.0.1 \
-  --set contrail_env.CONTROL_NODES=${CONTROL_NODES} \
-  --set contrail_env.CONTROL_DATA_NET_LIST=${CONTROL_DATA_NET_LIST} \
-  --set contrail_env.VROUTER_GATEWAY=${VROUTER_GATEWAY}
+  tee /tmp/contrail.yaml << EOF
+  global:
+    contrail_env:
+      CONTROLLER_NODES: ${CONTROL_NODES}
+      LOG_LEVEL: SYS_NOTICE
+      CLOUD_ORCHESTRATOR: openstack
+      AAA_MODE: cloud-admin
+      CONTROL_DATA_NET_LIST: ${CONTROL_DATA_NET_LIST}
+      VROUTER_GATEWAY: ${VROUTER_GATEWAY}
+EOF
+
+  helm install --name contrail ${CHD_PATH}/contrail \
+  --namespace=contrail --values=/tmp/contrail.yaml
   ```
 
 6. Deploy heat charts
diff --git a/doc/contrail-osh-multinode-install-ocata.md b/doc/contrail-osh-multinode-install-ocata.md
index ad6103a..e884d7d 100644
--- a/doc/contrail-osh-multinode-install-ocata.md
+++ b/doc/contrail-osh-multinode-install-ocata.md
@@ -210,48 +210,52 @@ Here are each chart **"contrail_env"** reference values.yaml file (**FYI**)
 * **contrail-thirdparty/values.yaml**
 
 ```Text
-contrail_env:
-  CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
+global:
+  contrail_env:
+    CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 ```
 
 * **contrail-controller/values.yaml**
 
 ```Text
-contrail_env:
-  CONTROL_NODES: 192.168.1.237,192.168.1.238,192.168.1.239
-  CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-  BGP_PORT: 1179
+global:
+  contrail_env:
+    CONTROL_NODES: 192.168.1.237,192.168.1.238,192.168.1.239
+    CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
+    BGP_PORT: 1179
 ```
 
 * **contrail-analytics/values.yaml**
 
 ```Text
-contrail_env:
-  CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
+global:
+  contrail_env:
+    CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
 ```
 
 * **contrail-vrouter/values.yaml**
 
 ```Text
-contrail_env:
-  CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
-  CONTROL_NODES: 192.168.1.237,192.168.1.238,192.168.1.239
-  LOG_LEVEL: SYS_NOTICE
-  CLOUD_ORCHESTRATOR: openstack
-  AAA_MODE: cloud-admin
-  CONTROL_DATA_NET_LIST: 192.168.1.0/24
-  VROUTER_GATEWAY: 192.168.1.1
-contrail_env_vrouter_kernel:
-  AGENT_MODE: nic
+global:
+  contrail_env:
+    CONTROLLER_NODES: 10.13.82.237,10.13.82.238,10.13.82.239
+    CONTROL_NODES: 192.168.1.237,192.168.1.238,192.168.1.239
+    LOG_LEVEL: SYS_NOTICE
+    CLOUD_ORCHESTRATOR: openstack
+    AAA_MODE: cloud-admin
+    CONTROL_DATA_NET_LIST: 192.168.1.0/24
+    VROUTER_GATEWAY: 192.168.1.1
+  contrail_env_vrouter_kernel:
+    AGENT_MODE: nic
 ```
 
 Here are helm install commands to deploy Contrail helm chart after setting configuration parameters in "values.yaml" files.