diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 4c87d49..9d05115 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   An IP address management (IPAM) and data center infrastructure management (DCIM) tool.
 appVersion: v3.7.1
 type: application
-version: 6.0.4
+version: 6.0.5
 maintainers:
 - name: Tommy Skaug
   email: tommy@skaug.me
diff --git a/charts/netbox/templates/deployment-housekeeping.yaml b/charts/netbox/templates/deployment-housekeeping.yaml
index daeaf23..f55d5f4 100644
--- a/charts/netbox/templates/deployment-housekeeping.yaml
+++ b/charts/netbox/templates/deployment-housekeeping.yaml
@@ -13,7 +13,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ include "netbox.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      component: housekeeping
+      app.kubernetes.io/component: housekeeping
   template:
     metadata:
       annotations:
@@ -21,7 +21,7 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "netbox.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        component: housekeeping
+        app.kubernetes.io/component: housekeeping
     spec:
       containers:
         - name: {{ .Chart.Name }}-housekeeping
diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml
index b8965aa..e06c91f 100644
--- a/charts/netbox/templates/deployment-worker.yaml
+++ b/charts/netbox/templates/deployment-worker.yaml
@@ -15,7 +15,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ include "netbox.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      component: worker
+      app.kubernetes.io/component: worker
   template:
     metadata:
       annotations:
diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
index dff0914..102353b 100644
--- a/charts/netbox/templates/deployment.yaml
+++ b/charts/netbox/templates/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ include "netbox.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      component: app
+      app.kubernetes.io/component: app
   template:
     metadata:
       annotations: