diff --git a/Makefile b/Makefile
index c3de0908a4..1e772b407d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: ceph mariadb keystone memcached rabbitmq common openstack all clean 
+.PHONY: ceph bootstrap mariadb keystone memcached rabbitmq common openstack all clean 
 
 B64_DIRS := common/secrets
 B64_EXCLUDE := $(wildcard common/secrets/*.b64)
@@ -6,12 +6,14 @@ B64_EXCLUDE := $(wildcard common/secrets/*.b64)
 CHARTS := ceph mariadb rabbitmq memcached keystone openstack
 COMMON_TPL := common/templates/_globals.tpl
 
-all: common ceph mariadb rabbitmq memcached keystone openstack
+all: common bootstrap mariadb rabbitmq memcached keystone openstack
 
 common: build-common
 
 ceph: build-ceph
 
+bootstrap: build-bootstrap
+
 mariadb: build-mariadb
 
 keystone: build-keystone
diff --git a/bootstrap/.gitignore b/bootstrap/.gitignore
new file mode 100644
index 0000000000..e1bd7e85af
--- /dev/null
+++ b/bootstrap/.gitignore
@@ -0,0 +1,3 @@
+secrets/*
+!secrets/.gitkeep 
+templates/_secrets.tpl
diff --git a/bootstrap/.helmignore b/bootstrap/.helmignore
new file mode 100644
index 0000000000..e8ef5ffab2
--- /dev/null
+++ b/bootstrap/.helmignore
@@ -0,0 +1,27 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+
+bin/
+etc/
+patches/
+*.py
+Makefile
diff --git a/bootstrap/Chart.yaml b/bootstrap/Chart.yaml
new file mode 100755
index 0000000000..a813321a5a
--- /dev/null
+++ b/bootstrap/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: aic-helm namespace bootstrap
+name: bootstrap
+version: 0.1.0
diff --git a/ceph/requirements.lock b/bootstrap/requirements.lock
similarity index 78%
rename from ceph/requirements.lock
rename to bootstrap/requirements.lock
index 3bcbd6ea74..e5d7bf64b5 100644
--- a/ceph/requirements.lock
+++ b/bootstrap/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: http://localhost:8879/charts
   version: 0.1.0
 digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
-generated: 2016-11-29T12:54:37.241999965-08:00
+generated: 2016-11-30T17:10:48.887264789-08:00
diff --git a/bootstrap/requirements.yaml b/bootstrap/requirements.yaml
new file mode 100644
index 0000000000..c36a1cba34
--- /dev/null
+++ b/bootstrap/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies: 
+- name: common
+  repository: http://localhost:8879/charts
+  version: 0.1.0
diff --git a/common/templates/secrets.yaml b/bootstrap/templates/secrets.yaml
similarity index 58%
rename from common/templates/secrets.yaml
rename to bootstrap/templates/secrets.yaml
index 3f6d335cb7..62387f2f2b 100644
--- a/common/templates/secrets.yaml
+++ b/bootstrap/templates/secrets.yaml
@@ -4,8 +4,9 @@ kind: Secret
 metadata:
   name: "pvc-ceph-conf-combined-storageclass"
 type: kubernetes.io/rbd
-data:
-  key: {{ include "secrets/ceph-client-key"  . | quote }}
+data: 
+  key: |
+{{ include "secrets/ceph-client-key" . | b64enc | indent 4 }}
 ---
 apiVersion: v1
 kind: Secret
@@ -13,4 +14,5 @@ metadata:
   name: "pvc-ceph-client-key"
 type: kubernetes.io/rbd
 data:
-  key: {{ include "secrets/ceph-client-key"  . | quote }}
+  key: |
+{{ include "secrets/ceph-client-key" . | b64enc | indent 4 }}
diff --git a/bootstrap/values.yaml b/bootstrap/values.yaml
new file mode 100644
index 0000000000..ff56130f6c
--- /dev/null
+++ b/bootstrap/values.yaml
@@ -0,0 +1,4 @@
+# Default values for bootstrap.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value
diff --git a/ceph/templates/secrets.yaml b/ceph/templates/secrets.yaml
index 0dde40ebad..eafaca486f 100644
--- a/ceph/templates/secrets.yaml
+++ b/ceph/templates/secrets.yaml
@@ -28,7 +28,7 @@ metadata:
 type: Opaque
 data:
   ceph.keyring: |
-{{ include "secrets/ceph.mds.keyring"  . | b64enc | indent 4 }}
+{{ include "secrets/ceph.mds.keyring" . | b64enc | indent 4 }}
 ---
 apiVersion: v1
 kind: Secret
@@ -37,7 +37,7 @@ metadata:
 type: Opaque
 data:
   ceph.keyring: |
-{{ include "secrets/ceph.osd.keyring"  . | b64enc | indent 4 }}
+{{ include "secrets/ceph.osd.keyring" . | b64enc | indent 4 }}
 ---
 apiVersion: v1
 kind: Secret
@@ -45,4 +45,5 @@ metadata:
   name: "ceph-client-key"
 type: Opaque
 data:
-  ceph-client-key: {{ include "secrets/ceph-client-key"  . | b64enc | quote }}  
+  ceph-client-key: |
+{{ include "secrets/ceph-client-key" . | b64enc | indent 4 }}
diff --git a/common/requirements.lock b/common/requirements.lock
index 5f8e638185..98d4c0a4eb 100644
--- a/common/requirements.lock
+++ b/common/requirements.lock
@@ -1,3 +1,3 @@
 dependencies: []
 digest: sha256:81059fe6210ccee4e3349c0f34c12d180f995150128a913d63b65b7937c6b152
-generated: 2016-11-25T16:25:49.376763578-08:00
+generated: 2016-11-30T17:10:48.32482926-08:00
diff --git a/keystone/requirements.lock b/keystone/requirements.lock
index a9bade3282..33d057c17f 100644
--- a/keystone/requirements.lock
+++ b/keystone/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: memcached
+- name: common
   repository: http://localhost:8879/charts
   version: 0.1.0
-digest: sha256:481dd0955bd39e18cee2026239f140f595f08b988736ad8c1ef95c6212f619c4
-generated: 2016-11-25T16:15:47.611304031-08:00
+digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
+generated: 2016-11-30T17:10:51.579937981-08:00
diff --git a/keystone/requirements.yaml b/keystone/requirements.yaml
index d95ff2531b..2350b1facb 100644
--- a/keystone/requirements.yaml
+++ b/keystone/requirements.yaml
@@ -2,15 +2,3 @@ dependencies:
   - name: common
     repository: http://localhost:8879/charts
     version: 0.1.0
-dependencies:
-  - name: mariadb
-    repository: http://localhost:8879/charts
-    version: 0.1.0    
-dependencies:
-  - name: rabbitmq
-    repository: http://localhost:8879/charts
-    version: 0.1.0    
-dependencies:
-  - name: memcached
-    repository: http://localhost:8879/charts
-    version: 0.1.0
diff --git a/mariadb/requirements.lock b/mariadb/requirements.lock
index e992d3b617..9c460b97df 100644
--- a/mariadb/requirements.lock
+++ b/mariadb/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: http://localhost:8879/charts
   version: 0.1.0
 digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
-generated: 2016-11-29T11:31:25.670403608-08:00
+generated: 2016-11-30T17:10:49.537749902-08:00
diff --git a/mariadb/templates/mariadb-deployment.yaml b/mariadb/templates/mariadb-deployment.yaml
index c3f6887941..a19eb03b26 100644
--- a/mariadb/templates/mariadb-deployment.yaml
+++ b/mariadb/templates/mariadb-deployment.yaml
@@ -1,14 +1,3 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mariadb
-spec:
-  ports:
-    - name: db
-      port: {{ .Values.network.port.mariadb }}
-  selector:
-    app: mariadb
 {{- $root := . -}}
 {{ range $k, $v := until (atoi .Values.replicas) }}
 ---
diff --git a/mariadb/templates/mariadb-service.yaml b/mariadb/templates/mariadb-service.yaml
index 5b3dae0490..2fa2f6319a 100644
--- a/mariadb/templates/mariadb-service.yaml
+++ b/mariadb/templates/mariadb-service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: mariadb
 spec:
   ports:
-    - port: {{ .Values.network.port.mariadb }}
+    - name: db
+      port: {{ .Values.network.port.mariadb }}
   selector:
     app: mariadb
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 5f7ee60091..e0a7f433e3 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -9,7 +9,7 @@ images:
   mariadb: quay.io/stackanetes/stackanetes-mariadb:newton
 
 volume:
-  class_path: volume.alpha.kubernetes.io/storage-class
+  class_path: volume.beta.kubernetes.io/storage-class
   class_name: general
   size: 20Gi
 
diff --git a/memcached/requirements.lock b/memcached/requirements.lock
index 777c352bf5..a30dd69a13 100644
--- a/memcached/requirements.lock
+++ b/memcached/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: http://localhost:8879/charts
   version: 0.1.0
 digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
-generated: 2016-11-29T11:31:27.05384225-08:00
+generated: 2016-11-30T17:10:50.917838584-08:00
diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml
index 2715ef7555..318425485f 100644
--- a/memcached/templates/deployment.yaml
+++ b/memcached/templates/deployment.yaml
@@ -15,7 +15,19 @@ spec:
         - name: memcached
           image: {{ .Values.images.memcached }}
           imagePullPolicy: Always
-          command: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024"
+          env:
+            - name: INTERFACE_NAME
+              value: "eth0"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: COMMAND
+              value: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024"
           ports:
             - containerPort: {{ .Values.network.port }}
           readinessProbe:
diff --git a/openstack/requirements.lock b/openstack/requirements.lock
index 51ea2d5fe7..73571f11ba 100644
--- a/openstack/requirements.lock
+++ b/openstack/requirements.lock
@@ -15,4 +15,4 @@ dependencies:
   repository: http://localhost:8879/charts
   version: 0.1.0
 digest: sha256:e92d6b6811d65492a95e4db258d516bfd7dd540108bb3d0e92e7dabc13ae2bbf
-generated: 2016-11-29T11:31:33.541933538-08:00
+generated: 2016-11-30T17:10:52.235026033-08:00
diff --git a/rabbitmq/requirements.lock b/rabbitmq/requirements.lock
index 6ba5103cdf..3d8db9f442 100644
--- a/rabbitmq/requirements.lock
+++ b/rabbitmq/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: http://localhost:8879/charts
   version: 0.1.0
 digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
-generated: 2016-11-29T11:31:26.360492977-08:00
+generated: 2016-11-30T17:10:50.189434385-08:00
diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml
index 69bf410239..21bbd5f8fa 100644
--- a/rabbitmq/templates/deployment.yaml
+++ b/rabbitmq/templates/deployment.yaml
@@ -14,9 +14,9 @@ spec:
       volumes:
         - name: rabbitmq-emptydir
           emptyDir: {}
-        - name: start-rabbitmq
+        - name: rabbitmq-bin
           configMap:
-            name: start-rabbitmq
+            name: rabbitmq-bin
       containers:
         - name: rabbitmq
           image: {{ .Values.images.rabbitmq }}
@@ -36,6 +36,6 @@ spec:
           volumeMounts:
             - name: rabbitmq-emptydir
               mountPath: /var/lib/rabbitmq
-            - mountPath: /tmp/start_rabbitmq.sh
-              name: start-rabbitmq
+            - name: rabbitmq-bin
+              mountPath: /tmp/start_rabbitmq.sh
               subPath: start_rabbitmq.sh