diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 9d05115..ff68165 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.5
+version: 6.0.6
 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 f55d5f4..85b7660 100644
--- a/charts/netbox/templates/deployment-housekeeping.yaml
+++ b/charts/netbox/templates/deployment-housekeeping.yaml
@@ -6,22 +6,17 @@ metadata:
   name: {{ include "netbox.fullname" . }}-housekeeping
   labels:
     {{- include "netbox.labels" . | nindent 4 }}
-    app.kubernetes.io/component: housekeeping
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "netbox.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/component: housekeeping
+      app.kubernetes.io/component: {{ include "netbox.fullname" . }}-housekeeping
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }}
       labels:
-        app.kubernetes.io/name: {{ include "netbox.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/component: housekeeping
+        app.kubernetes.io/component: {{ include "netbox.fullname" . }}-housekeeping
     spec:
       containers:
         - name: {{ .Chart.Name }}-housekeeping
diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml
index e06c91f..d6d2c67 100644
--- a/charts/netbox/templates/deployment-worker.yaml
+++ b/charts/netbox/templates/deployment-worker.yaml
@@ -5,24 +5,18 @@ kind: Deployment
 metadata:
   name: {{ include "netbox.fullname" . }}-worker
   labels:
-    app.kubernetes.io/name: {{ include "netbox.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
+    {{- include "netbox.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.worker.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "netbox.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/component: worker
+      app.kubernetes.io/component: {{ include "netbox.fullname" . }}-worker
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }}
       labels:
-        {{- include "netbox.labels" . | nindent 8 }}
-        app.kubernetes.io/component: worker
+        app.kubernetes.io/component: {{ include "netbox.fullname" . }}-worker
     spec:
       containers:
         - name: {{ .Chart.Name }}-worker
diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
index 102353b..ff3b750 100644
--- a/charts/netbox/templates/deployment.yaml
+++ b/charts/netbox/templates/deployment.yaml
@@ -2,26 +2,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "netbox.fullname" . }}
+  name: {{ include "netbox.fullname" . }}-app
   labels:
-    app.kubernetes.io/name: {{ include "netbox.name" . }}
-    helm.sh/chart: {{ include "netbox.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "netbox.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "netbox.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/component: app
+      app.kubernetes.io/component: {{ include "netbox.fullname" . }}-app
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configuration.yaml") . | sha256sum }}
       labels:
-        {{- include "netbox.labels" . | nindent 8 }}
-        app.kubernetes.io/component: app
+        app.kubernetes.io/component: {{ include "netbox.fullname" . }}-app
     spec:
       containers:
         - name: {{ .Chart.Name }}