diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 098372d..a6d1795 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.8
+version: 6.0.9
 maintainers:
 - name: Tommy Skaug
   email: tommy@skaug.me
diff --git a/charts/netbox/templates/configuration.yaml b/charts/netbox/templates/configuration.yaml
index 6b43ee1..528ba80 100644
--- a/charts/netbox/templates/configuration.yaml
+++ b/charts/netbox/templates/configuration.yaml
@@ -4,10 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Chart.Name }}-extra
   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 }}
 data:
   extra.py: |
     {{- .Values.extraConfiguration | nindent 4 }}
@@ -18,10 +15,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Chart.Name }}-plugins
   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 }}
 data:
   plugins.py: |
     {{- .Values.extraPlugins | nindent 4 }}
@@ -32,10 +26,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "netbox.fullname" . }}
   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 }}
 data:
   tmp: "test"
 {{- range $key, $value := .Values.extraEnv }}
diff --git a/charts/netbox/templates/pvc.yaml b/charts/netbox/templates/pvc.yaml
index 257199a..8869824 100644
--- a/charts/netbox/templates/pvc.yaml
+++ b/charts/netbox/templates/pvc.yaml
@@ -4,10 +4,7 @@ apiVersion: v1
 metadata:
   name: {{ template "netbox.fullname" . }}
   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:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}
diff --git a/charts/netbox/templates/service.yaml b/charts/netbox/templates/service.yaml
index 255563f..7edb692 100644
--- a/charts/netbox/templates/service.yaml
+++ b/charts/netbox/templates/service.yaml
@@ -3,10 +3,7 @@ kind: Service
 metadata:
   name: {{ include "netbox.fullname" . }}
   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:
   type: {{ .Values.service.type }}
   ports:
@@ -15,6 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app.kubernetes.io/name: {{ include "netbox.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    component: app
+    app: {{ include "netbox.fullname" . }}-app