diff --git a/apps/docker-registry/base/cronjob.yaml b/apps/docker-registry/base/cronjob.yaml
index 3f59fdc..2222f8a 100644
--- a/apps/docker-registry/base/cronjob.yaml
+++ b/apps/docker-registry/base/cronjob.yaml
@@ -5,17 +5,13 @@ kind: CronJob
 metadata:
   name: docker-registry-garbage-collector
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.3
-    release: docker-registry
-    heritage: Helm
+    app.kubernetes.io/name: docker-registry
 spec:
   schedule: "0 1 * * *"
   jobTemplate:
     metadata:
       labels:
-        app: docker-registry
-        release: docker-registry
+        app.kubernetes.io/name: docker-registry
       annotations:
         checksum/config: 7768037b11264d8a85079c7389faa0b2846b55771ae7ea102d41f7ea868676fb
         checksum/secret: cf8de4fbecd435bc3788328888b074e895540fd0a0681fa391ee2d3f42e1e599
diff --git a/apps/docker-registry/base/ingress.yaml b/apps/docker-registry/base/ingress.yaml
index 4c7ce61..3ec55d8 100644
--- a/apps/docker-registry/base/ingress.yaml
+++ b/apps/docker-registry/base/ingress.yaml
@@ -4,12 +4,8 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: docker-registry
-  namespace: gitops
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.3
-    release: docker-registry
-    heritage: Helm
+    app.kubernetes.io/name: docker-registry
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-issuer
     # nginx.ingress.kubernetes.io/whitelist-source-range: 192.168.1.1/16
diff --git a/apps/docker-registry/base/pdb.yaml b/apps/docker-registry/base/pdb.yaml
index 8a72286..ac53425 100644
--- a/apps/docker-registry/base/pdb.yaml
+++ b/apps/docker-registry/base/pdb.yaml
@@ -4,16 +4,10 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: docker-registry
-  namespace: gitops
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.3
-    release: docker-registry
-    heritage: Helm
+    app.kubernetes.io/name: docker-registry
 spec:
   selector:
     matchLabels:
-      app: docker-registry
-      release: docker-registry
+      app.kubernetes.io/name: docker-registry
   maxUnavailable: 1
-
diff --git a/apps/docker-registry/base/pvc.yaml b/apps/docker-registry/base/pvc.yaml
index 8ca3e6d..86dd989 100644
--- a/apps/docker-registry/base/pvc.yaml
+++ b/apps/docker-registry/base/pvc.yaml
@@ -4,16 +4,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: docker-registry
-  namespace: gitops
   labels:
-    app: docker-registry
-    chart: "docker-registry-2.2.3"
-    release: "docker-registry"
-    heritage: "Helm"
+    app.kubernetes.io/name: docker-registry
 spec:
   accessModes:
     - "ReadWriteOnce"
   resources:
     requests:
       storage: "10Gi"
-
diff --git a/apps/docker-registry/base/service.yaml b/apps/docker-registry/base/service.yaml
index 8701cf8..b303d71 100644
--- a/apps/docker-registry/base/service.yaml
+++ b/apps/docker-registry/base/service.yaml
@@ -4,12 +4,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: docker-registry
-  namespace: gitops
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.3
-    release: docker-registry
-    heritage: Helm
+    app.kubernetes.io/name: docker-registry
 spec:
   type: ClusterIP
   ports:
@@ -18,5 +14,4 @@ spec:
       name: http
       targetPort: 5000
   selector:
-    app: docker-registry
-    release: docker-registry
+    app.kubernetes.io/name: docker-registry
diff --git a/apps/docker-registry/overlays/system/deployment.patch.yaml b/apps/docker-registry/overlays/system/deployment.patch.yaml
index 90c322c..899d71c 100644
--- a/apps/docker-registry/overlays/system/deployment.patch.yaml
+++ b/apps/docker-registry/overlays/system/deployment.patch.yaml
@@ -3,10 +3,7 @@ kind: Deployment
 metadata:
   name: docker-registry
   labels:
-    app: docker-registry
-    chart: docker-registry-2.2.3
-    release: docker-registry
-    heritage: Helm
+    app.kubernetes.io/name: docker-registry
 spec:
   template:
     metadata:
diff --git a/apps/docker-registry/overlays/system/secret.enc.yaml b/apps/docker-registry/overlays/system/secret.enc.yaml
index f8dc4b2..3df68ab 100644
--- a/apps/docker-registry/overlays/system/secret.enc.yaml
+++ b/apps/docker-registry/overlays/system/secret.enc.yaml
@@ -5,12 +5,8 @@ apiVersion: v1
 kind: Secret
 metadata:
     name: docker-registry-secret
-    namespace: gitops
     labels:
-        app: docker-registry
-        chart: docker-registry-2.2.3
-        heritage: Helm
-        release: docker-registry
+        app.kubernetes.io/name: docker-registry
 type: Opaque
 data:
     htpasswd: ENC[AES256_GCM,data:5h7uURIfPb0rhgFkVtyAPaxvWdQme+XO658zokdFo/MW63ums/ZPfM1ZGNstxX9Vu9u+0xaEUShl3Nx40ZC1R0zIrxZiBkUVqP4wHn1cWMuENGAyuXx4ZA==,iv:gahLRzdg00DjgA1TjPWsP7Gl2L4pROdoUojS6FW0P7M=,tag:0fG1LgSXpslaU9Hpq65Zxw==,type:str]