diff --git a/README.rst b/README.rst
index 8e69cf4..deff35b 100644
--- a/README.rst
+++ b/README.rst
@@ -57,12 +57,6 @@
               enabled: true
               replicas: 1
               server: 10.254.0.10
-            heapster_influxdb:
-              enabled: true
-              public_ip: 185.22.97.132
-            ui:
-              enabled: true
-              public_ip: 185.22.97.131
           admin:
             password: password
             username: admin
diff --git a/kubernetes/files/kube-addons/registry/registry-rc.yaml b/kubernetes/files/kube-addons/registry/registry-rc.yaml
new file mode 100644
index 0000000..9e1a1de
--- /dev/null
+++ b/kubernetes/files/kube-addons/registry/registry-rc.yaml
@@ -0,0 +1,59 @@
+{%- from "kubernetes/map.jinja" import master with context %}
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: registry
+  namespace: kube-system
+  labels:
+    k8s-app: kube-registry
+    version: v0
+    kubernetes.io/cluster-service: "true"
+spec:
+  replicas: 1
+  selector:
+    k8s-app: kube-registry
+    version: v0
+  template:
+    metadata:
+      labels:
+        k8s-app: kube-registry
+        version: v0
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - name: registry
+        image: registry:2.5.1
+        resources:
+          limits:
+            cpu: 100m
+            memory: 100Mi
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        env:
+        - name: REGISTRY_HTTP_ADDR
+          value: {{ master.addons.registry.bind.get('host', '0.0.0.0'}}:{{ master.addons.registry.bind.get('port', '5000'}}
+        - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
+          value: /var/lib/registry
+        ports:
+        - containerPort: {{ master.addons.registry.bind.get('port', '5000') }}
+          name: registry
+          protocol: TCP
+      {%- if master.addons.registry.volume is defined %}
+        volumeMounts:
+        - name: image-store
+          mountPath: /var/lib/registry
+      volumes:
+        - name: image-store
+          {%- if master.addons.registry.volume.get('type', 'emptyDir') %}
+          emptyDir: {}
+          {%- elif master.addons.registry.volume.type == 'hostPath' %}
+          hostPath:
+            path: {{ master.addons.registry.volume.path }}
+          {%- elif master.addons.registry.volume.type == 'glusterfs' %}
+          glusterfs:
+            endpoints: {{ master.addons.registry.volume.endpoints }}
+            path: {{ master.addons.registry.volume.path }}
+            readOnly: {{ master.addons.registry.volume.read_only }}
+          {%- endif %}
+      {%- endif %}
diff --git a/kubernetes/files/kube-addons/registry/registry.svc b/kubernetes/files/kube-addons/registry/registry.svc
new file mode 100644
index 0000000..708a1ba
--- /dev/null
+++ b/kubernetes/files/kube-addons/registry/registry.svc
@@ -0,0 +1,17 @@
+{%- from "kubernetes/map.jinja" import master with context %}
+apiVersion: v1
+kind: Service
+metadata:
+  name: kube-registry
+  namespace: kube-system
+  labels:
+    k8s-app: kube-registry
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "KubeRegistry"
+spec:
+  selector:
+    k8s-app: kube-registry
+  ports:
+  - name: registry
+    port: {{ master.addons.registry.bind.get('port', '5000') }}
+    protocol: TCP
\ No newline at end of file
diff --git a/kubernetes/master/kube-addons.sls b/kubernetes/master/kube-addons.sls
index d50c8c9..6dc809c 100644
--- a/kubernetes/master/kube-addons.sls
+++ b/kubernetes/master/kube-addons.sls
@@ -46,13 +46,6 @@
     - dir_mode: 755
     - makedirs: True
 
-create_dashboard:
-  cmd.run:
-  - name: hyperkube kubectl create -f /etc/kubernetes/addons/dashboard/
-  - unless: hyperkube kubectl get rc --namespace=kube-system | grep dashboard
-  - require:
-    - service: kubelet
-
 {%- if master.network.engine == "opencontrail" %}
 
 /etc/kubernetes/addons/dashboard/dashboard-address.yaml:
diff --git a/kubernetes/master/setup.sls b/kubernetes/master/setup.sls
index c1505bf..72b378b 100644
--- a/kubernetes/master/setup.sls
+++ b/kubernetes/master/setup.sls
@@ -8,7 +8,7 @@
   cmd.run:
     - name: |
         hyperkube kubectl create -f /etc/kubernetes/addons/{{ addon_name }}
-    - unless: "hyperkube kubectl get rc {{ addon_name }} --namespace=kube-system"
+    - unless: "hyperkube kubectl get rc {{ addon.get('name', addon_name) }} --namespace=kube-system"
 
 {%- endif %}
 {%- endfor %}