diff --git a/deploy/addons/registry/registry-proxy.yaml.tmpl b/deploy/addons/registry/registry-proxy.yaml.tmpl
index 2131be382629..0a818fd9cb0a 100644
--- a/deploy/addons/registry/registry-proxy.yaml.tmpl
+++ b/deploy/addons/registry/registry-proxy.yaml.tmpl
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   labels:
-    kubernetes.io/minikube-addons: registry-proxy
+    kubernetes.io/minikube-addons: registry
     addonmanager.kubernetes.io/mode: Reconcile
   name: registry-proxy
   namespace: kube-system
@@ -10,7 +10,7 @@ spec:
   template:
     metadata:
       labels:
-        kubernetes.io/minikube-addons: registry-proxy
+        kubernetes.io/minikube-addons: registry
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
diff --git a/deploy/addons/registry/registry-rc.yaml.tmpl b/deploy/addons/registry/registry-rc.yaml.tmpl
index b39641aa47d4..ece62369a379 100644
--- a/deploy/addons/registry/registry-rc.yaml.tmpl
+++ b/deploy/addons/registry/registry-rc.yaml.tmpl
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
+    actual-registry: true
     kubernetes.io/minikube-addons: registry
     addonmanager.kubernetes.io/mode: Reconcile
   name: registry
@@ -13,6 +14,7 @@ spec:
   template:
     metadata:
       labels:
+        actual-registry: true
         kubernetes.io/minikube-addons: registry
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
diff --git a/deploy/addons/registry/registry-svc.yaml.tmpl b/deploy/addons/registry/registry-svc.yaml.tmpl
index e9f618ae256d..e601fd6fa827 100644
--- a/deploy/addons/registry/registry-svc.yaml.tmpl
+++ b/deploy/addons/registry/registry-svc.yaml.tmpl
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    actual-registry: true
     kubernetes.io/minikube-addons: registry
     addonmanager.kubernetes.io/mode: Reconcile
   name: registry
@@ -12,4 +13,5 @@ spec:
   - port: 80
     targetPort: 5000
   selector:
+    actual-registry: true
     kubernetes.io/minikube-addons: registry