diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go
index f5ee96d248..19ce6cc21b 100644
--- a/cmd/minikube/cmd/config/config.go
+++ b/cmd/minikube/cmd/config/config.go
@@ -127,6 +127,12 @@ var settings = []Setting{
 		validations: []setFn{IsValidAddon},
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
+	{
+		name:        "default-storageclass",
+		set:         SetBool,
+		validations: []setFn{IsValidAddon},
+		callbacks:   []setFn{EnableOrDisableAddon},
+	},
 	{
 		name:        "kube-dns",
 		set:         SetBool,
diff --git a/deploy/addons/addon-manager.yaml b/deploy/addons/addon-manager.yaml
index 907947236c..46acf82926 100644
--- a/deploy/addons/addon-manager.yaml
+++ b/deploy/addons/addon-manager.yaml
@@ -19,13 +19,13 @@ metadata:
   namespace: kube-system
   labels:
     component: kube-addon-manager
-    version: v6.4-alpha.1
+    version: v6.4
     kubernetes.io/minikube-addons: addon-manager
 spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1
+    image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.1
     imagePullPolicy: IfNotPresent
     resources:
       requests:
diff --git a/deploy/addons/dashboard/dashboard-rc.yaml b/deploy/addons/dashboard/dashboard-rc.yaml
index bd6bec4695..b423991374 100644
--- a/deploy/addons/dashboard/dashboard-rc.yaml
+++ b/deploy/addons/dashboard/dashboard-rc.yaml
@@ -18,22 +18,21 @@ metadata:
   name: kubernetes-dashboard
   namespace: kube-system
   labels:
-    app: kubernetes-dashboard
     version: v1.6.0
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: dashboard
 spec:
   replicas: 1
   selector:
     app: kubernetes-dashboard
     version: v1.6.0
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: kubernetes-dashboard
         version: v1.6.0
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - name: kubernetes-dashboard
diff --git a/deploy/addons/dashboard/dashboard-svc.yaml b/deploy/addons/dashboard/dashboard-svc.yaml
index f2e70ea809..b39a8001cb 100644
--- a/deploy/addons/dashboard/dashboard-svc.yaml
+++ b/deploy/addons/dashboard/dashboard-svc.yaml
@@ -20,7 +20,7 @@ metadata:
   namespace: kube-system
   labels:
     app: kubernetes-dashboard
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: dashboard
     kubernetes.io/minikube-addons-endpoint: dashboard
 spec:
diff --git a/deploy/addons/heapster/grafana-svc.yaml b/deploy/addons/heapster/grafana-svc.yaml
index 1762bf9ec4..8f4eace1c6 100644
--- a/deploy/addons/heapster/grafana-svc.yaml
+++ b/deploy/addons/heapster/grafana-svc.yaml
@@ -14,5 +14,5 @@ spec:
   - port: 80
     targetPort: 3000
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana
diff --git a/deploy/addons/heapster/heapster-rc.yaml b/deploy/addons/heapster/heapster-rc.yaml
index 9cbeddf2ff..df09248a57 100644
--- a/deploy/addons/heapster/heapster-rc.yaml
+++ b/deploy/addons/heapster/heapster-rc.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   replicas: 1
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
   template:
     metadata:
diff --git a/deploy/addons/heapster/heapster-svc.yaml b/deploy/addons/heapster/heapster-svc.yaml
index 054faa68fb..6719f2c78e 100644
--- a/deploy/addons/heapster/heapster-svc.yaml
+++ b/deploy/addons/heapster/heapster-svc.yaml
@@ -13,5 +13,5 @@ spec:
   - port: 80
     targetPort: 8082
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
diff --git a/deploy/addons/heapster/influxGrafana-rc.yaml b/deploy/addons/heapster/influxGrafana-rc.yaml
index e65d80e687..8de679572a 100644
--- a/deploy/addons/heapster/influxGrafana-rc.yaml
+++ b/deploy/addons/heapster/influxGrafana-rc.yaml
@@ -24,7 +24,7 @@ metadata:
 spec:
   replicas: 1
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana
   template:
     metadata:
diff --git a/deploy/addons/heapster/influxdb-svc.yaml b/deploy/addons/heapster/influxdb-svc.yaml
index c11bfd14f5..5ba0fc97fa 100644
--- a/deploy/addons/heapster/influxdb-svc.yaml
+++ b/deploy/addons/heapster/influxdb-svc.yaml
@@ -16,5 +16,5 @@ spec:
     port: 8086
     targetPort: 8086
   selector:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     name: influxGrafana
diff --git a/deploy/addons/ingress/ingress-configmap.yaml b/deploy/addons/ingress/ingress-configmap.yaml
index 488b41fad5..a08a538d55 100644
--- a/deploy/addons/ingress/ingress-configmap.yaml
+++ b/deploy/addons/ingress/ingress-configmap.yaml
@@ -20,4 +20,4 @@ metadata:
   name: nginx-load-balancer-conf
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
diff --git a/deploy/addons/ingress/ingress-rc.yaml b/deploy/addons/ingress/ingress-rc.yaml
index 4729f0caf0..7617b66f5a 100644
--- a/deploy/addons/ingress/ingress-rc.yaml
+++ b/deploy/addons/ingress/ingress-rc.yaml
@@ -18,17 +18,17 @@ metadata:
   name: default-http-backend
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
     app: default-http-backend
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: default-http-backend
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       terminationGracePeriodSeconds: 60
       containers:
@@ -62,18 +62,18 @@ metadata:
   namespace: kube-system
   labels:
     app: nginx-ingress-controller
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
     app: nginx-ingress-controller
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         app: nginx-ingress-controller
         name: nginx-ingress-controller
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       terminationGracePeriodSeconds: 60
       containers:
diff --git a/deploy/addons/ingress/ingress-svc.yaml b/deploy/addons/ingress/ingress-svc.yaml
index 28a56b0ddd..8ee281a43a 100644
--- a/deploy/addons/ingress/ingress-svc.yaml
+++ b/deploy/addons/ingress/ingress-svc.yaml
@@ -19,7 +19,7 @@ metadata:
   namespace: kube-system
   labels:
     app: default-http-backend
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   type: NodePort
   ports:
diff --git a/deploy/addons/kube-dns/kube-dns-controller.yaml b/deploy/addons/kube-dns/kube-dns-controller.yaml
index e1475cdcd9..c162670d5a 100644
--- a/deploy/addons/kube-dns/kube-dns-controller.yaml
+++ b/deploy/addons/kube-dns/kube-dns-controller.yaml
@@ -20,7 +20,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    kubernetes.io/cluster-service: "true"
+    version: v20
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
diff --git a/deploy/addons/kube-dns/kube-dns-svc.yaml b/deploy/addons/kube-dns/kube-dns-svc.yaml
index 64036867a6..1986b1e394 100644
--- a/deploy/addons/kube-dns/kube-dns-svc.yaml
+++ b/deploy/addons/kube-dns/kube-dns-svc.yaml
@@ -19,7 +19,7 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeDNS"
 spec:
   selector:
diff --git a/deploy/addons/registry-creds/registry-creds-rc.yaml b/deploy/addons/registry-creds/registry-creds-rc.yaml
index 4f0205bc66..f6f07008fd 100644
--- a/deploy/addons/registry-creds/registry-creds-rc.yaml
+++ b/deploy/addons/registry-creds/registry-creds-rc.yaml
@@ -5,20 +5,20 @@ metadata:
   namespace: kube-system
   labels:
     version: v1.7
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/minikube-addons: registry-creds
 spec:
   replicas: 1
   selector:
     name: registry-creds
     version: v1.7
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
         name: registry-creds
         version: v1.7
-        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - image: upmcenterprises/registry-creds:1.7
@@ -67,4 +67,4 @@ spec:
       volumes:
       - name: gcr-creds
         secret:
-          secretName: registry-creds-gcr
\ No newline at end of file
+          secretName: registry-creds-gcr
diff --git a/deploy/addons/storageclass/storageclass.yaml b/deploy/addons/storageclass/storageclass.yaml
index f4a21d4ee4..acc218276e 100644
--- a/deploy/addons/storageclass/storageclass.yaml
+++ b/deploy/addons/storageclass/storageclass.yaml
@@ -6,6 +6,6 @@ metadata:
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
-    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 
 provisioner: k8s.io/minikube-hostpath