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/bootstrap/requirements.lock b/bootstrap/requirements.lock
new file mode 100644
index 0000000000..91b1120735
--- /dev/null
+++ b/bootstrap/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: http://localhost:8879/charts
+  version: 0.1.0
+digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
+generated: 2016-11-30T16:45:40.895492737-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 100%
rename from common/templates/secrets.yaml
rename to bootstrap/templates/secrets.yaml
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