diff --git a/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml b/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml
index c49a3d9f..4f6d0c4a 100644
--- a/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml
+++ b/charts/library/common-test/tests/controller/metadata_cronjob_test.yaml
@@ -22,7 +22,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -50,7 +50,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -85,7 +85,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -116,7 +116,7 @@ tests:
         equal:
           path: spec.jobTemplate.spec.template.metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: RELEASE-NAME
             test_label: test
diff --git a/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml b/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml
index 6adb0294..3df79c3f 100644
--- a/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml
+++ b/charts/library/common-test/tests/controller/metadata_daemonset_test.yaml
@@ -18,7 +18,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -46,7 +46,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -81,7 +81,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
diff --git a/charts/library/common-test/tests/controller/metadata_deployment_test.yaml b/charts/library/common-test/tests/controller/metadata_deployment_test.yaml
index 78f04d2a..59800904 100644
--- a/charts/library/common-test/tests/controller/metadata_deployment_test.yaml
+++ b/charts/library/common-test/tests/controller/metadata_deployment_test.yaml
@@ -18,7 +18,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -46,7 +46,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -81,7 +81,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
diff --git a/charts/library/common-test/tests/controller/metadata_job_test.yaml b/charts/library/common-test/tests/controller/metadata_job_test.yaml
index b7521ad6..688793c7 100644
--- a/charts/library/common-test/tests/controller/metadata_job_test.yaml
+++ b/charts/library/common-test/tests/controller/metadata_job_test.yaml
@@ -18,7 +18,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -46,7 +46,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -81,7 +81,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -112,7 +112,7 @@ tests:
         equal:
           path: spec.template.metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: RELEASE-NAME
             test_label: test
diff --git a/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml b/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml
index 1835a671..00bd75c2 100644
--- a/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml
+++ b/charts/library/common-test/tests/controller/metadata_statefulset_test.yaml
@@ -18,7 +18,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -46,7 +46,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
@@ -81,7 +81,7 @@ tests:
         equal:
           path: metadata.labels
           value:
-            common.bjw-s.dev/controller: main
+            app.kubernetes.io/component: main
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: RELEASE-NAME
diff --git a/charts/library/common-test/tests/controller/type_test.yaml b/charts/library/common-test/tests/controller/type_test.yaml
index 33e167db..6705e7c5 100644
--- a/charts/library/common-test/tests/controller/type_test.yaml
+++ b/charts/library/common-test/tests/controller/type_test.yaml
@@ -15,7 +15,7 @@ tests:
           value: RELEASE-NAME
       - documentIndex: *deploymentDoc
         equal:
-          path: metadata.labels['common.bjw-s.dev/controller']
+          path: metadata.labels['app.kubernetes.io/component']
           value: main
 
   - it: additional controllers should pass
@@ -39,7 +39,7 @@ tests:
           value: RELEASE-NAME-main
       - documentIndex: *firstDeploymentDoc
         equal:
-          path: metadata.labels['common.bjw-s.dev/controller']
+          path: metadata.labels['app.kubernetes.io/component']
           value: main
       - documentIndex: &secondDeploymentDoc 1
         isKind:
@@ -50,7 +50,7 @@ tests:
           value: RELEASE-NAME-second
       - documentIndex: *secondDeploymentDoc
         equal:
-          path: metadata.labels['common.bjw-s.dev/controller']
+          path: metadata.labels['app.kubernetes.io/component']
           value: second
 
   - it: additional controllers with nameOverride should pass
@@ -75,7 +75,7 @@ tests:
           value: RELEASE-NAME-main
       - documentIndex: *firstDeploymentDoc
         equal:
-          path: metadata.labels['common.bjw-s.dev/controller']
+          path: metadata.labels['app.kubernetes.io/component']
           value: main
       - documentIndex: &secondDeploymentDoc 1
         isKind:
@@ -86,7 +86,7 @@ tests:
           value: RELEASE-NAME-testOverride
       - documentIndex: *secondDeploymentDoc
         equal:
-          path: metadata.labels['common.bjw-s.dev/controller']
+          path: metadata.labels['app.kubernetes.io/component']
           value: second
 
   - it: daemonset should pass
diff --git a/charts/library/common-test/tests/networkpolicy/values_test.yaml b/charts/library/common-test/tests/networkpolicy/values_test.yaml
index 8dbb17bf..012b3066 100644
--- a/charts/library/common-test/tests/networkpolicy/values_test.yaml
+++ b/charts/library/common-test/tests/networkpolicy/values_test.yaml
@@ -50,7 +50,7 @@ tests:
           path: spec.podSelector
           value:
             matchLabels:
-              common.bjw-s.dev/controller: main
+              app.kubernetes.io/component: main
               app.kubernetes.io/instance: RELEASE-NAME
               app.kubernetes.io/name: RELEASE-NAME
 
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 297c6eb7..33ea9ca6 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 3.0.0
+version: 3.0.1
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
diff --git a/charts/library/common/README.md b/charts/library/common/README.md
index 2c2f70c7..18f28661 100644
--- a/charts/library/common/README.md
+++ b/charts/library/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for Helm charts
 
@@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
   - name: common
-    version: 3.0.0
+    version: 3.0.1
     repository: https://bjw-s.github.io/helm-charts/
 ```
 
diff --git a/charts/library/common/templates/classes/_cronjob.tpl b/charts/library/common/templates/classes/_cronjob.tpl
index 04a26be6..91d0d7aa 100644
--- a/charts/library/common/templates/classes/_cronjob.tpl
+++ b/charts/library/common/templates/classes/_cronjob.tpl
@@ -12,7 +12,7 @@ using the common library.
   {{- end -}}
 
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $cronjobObject.identifier)
+    (dict "app.kubernetes.io/component" $cronjobObject.identifier)
     ($cronjobObject.labels | default dict)
     (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
   -}}
diff --git a/charts/library/common/templates/classes/_daemonset.tpl b/charts/library/common/templates/classes/_daemonset.tpl
index 990f7be8..0ce6edd2 100644
--- a/charts/library/common/templates/classes/_daemonset.tpl
+++ b/charts/library/common/templates/classes/_daemonset.tpl
@@ -7,7 +7,7 @@ within the common library.
   {{- $daemonsetObject := .object -}}
 
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $daemonsetObject.identifier)
+    (dict "app.kubernetes.io/component" $daemonsetObject.identifier)
     ($daemonsetObject.labels | default dict)
     (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
   -}}
@@ -30,7 +30,7 @@ spec:
   revisionHistoryLimit: {{ default 3 $daemonsetObject.revisionHistoryLimit }}
   selector:
     matchLabels:
-      common.bjw-s.dev/controller: {{ $daemonsetObject.identifier }}
+      app.kubernetes.io/component: {{ $daemonsetObject.identifier }}
       {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
   template:
     metadata:
diff --git a/charts/library/common/templates/classes/_deployment.tpl b/charts/library/common/templates/classes/_deployment.tpl
index d10f1e51..b39f9dff 100644
--- a/charts/library/common/templates/classes/_deployment.tpl
+++ b/charts/library/common/templates/classes/_deployment.tpl
@@ -7,7 +7,7 @@ using the common library.
   {{- $deploymentObject := .object -}}
 
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $deploymentObject.identifier)
+    (dict "app.kubernetes.io/component" $deploymentObject.identifier)
     ($deploymentObject.labels | default dict)
     (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
   -}}
@@ -50,7 +50,7 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      common.bjw-s.dev/controller: {{ $deploymentObject.identifier }}
+      app.kubernetes.io/component: {{ $deploymentObject.identifier }}
       {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
   template:
     metadata:
diff --git a/charts/library/common/templates/classes/_job.tpl b/charts/library/common/templates/classes/_job.tpl
index eca0b888..0ba51539 100644
--- a/charts/library/common/templates/classes/_job.tpl
+++ b/charts/library/common/templates/classes/_job.tpl
@@ -7,7 +7,7 @@ within the common library.
   {{- $jobObject := .object -}}
 
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $jobObject.identifier)
+    (dict "app.kubernetes.io/component" $jobObject.identifier)
     ($jobObject.labels | default dict)
     (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
   -}}
diff --git a/charts/library/common/templates/classes/_networkpolicy.tpl b/charts/library/common/templates/classes/_networkpolicy.tpl
index 536b78d3..0854d145 100644
--- a/charts/library/common/templates/classes/_networkpolicy.tpl
+++ b/charts/library/common/templates/classes/_networkpolicy.tpl
@@ -20,7 +20,7 @@ within the common library.
   {{- else -}}
     {{- $podSelector = dict "matchLabels" (merge
       ($networkPolicyObject.extraSelectorLabels | default dict)
-      (dict "common.bjw-s.dev/controller" $networkPolicyObject.controller)
+      (dict "app.kubernetes.io/component" $networkPolicyObject.controller)
       (include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml)
     ) -}}
   {{- end -}}
diff --git a/charts/library/common/templates/classes/_service.tpl b/charts/library/common/templates/classes/_service.tpl
index 7a6dd93e..35aa24f5 100644
--- a/charts/library/common/templates/classes/_service.tpl
+++ b/charts/library/common/templates/classes/_service.tpl
@@ -96,7 +96,7 @@ spec:
       {{- end -}}
   {{- with (merge
     ($serviceObject.extraSelectorLabels | default dict)
-    (dict "common.bjw-s.dev/controller" $serviceObject.controller)
+    (dict "app.kubernetes.io/component" $serviceObject.controller)
     (include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | fromYaml)
   ) }}
   selector: {{- toYaml . | nindent 4 }}
diff --git a/charts/library/common/templates/classes/_statefulset.tpl b/charts/library/common/templates/classes/_statefulset.tpl
index 2c3c79ea..c244aca5 100644
--- a/charts/library/common/templates/classes/_statefulset.tpl
+++ b/charts/library/common/templates/classes/_statefulset.tpl
@@ -7,7 +7,7 @@ within the common library.
   {{- $statefulsetObject := .object -}}
 
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $statefulsetObject.identifier)
+    (dict "app.kubernetes.io/component" $statefulsetObject.identifier)
     ($statefulsetObject.labels | default dict)
     (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
   -}}
@@ -38,7 +38,7 @@ spec:
     {{- end }}
   selector:
     matchLabels:
-      common.bjw-s.dev/controller: {{ $statefulsetObject.identifier }}
+      app.kubernetes.io/component: {{ $statefulsetObject.identifier }}
       {{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
   serviceName: {{ include "bjw-s.common.lib.chart.names.fullname" $rootContext }}
   template:
diff --git a/charts/library/common/templates/lib/pod/metadata/_labels.tpl b/charts/library/common/templates/lib/pod/metadata/_labels.tpl
index 83121383..837ffa29 100644
--- a/charts/library/common/templates/lib/pod/metadata/_labels.tpl
+++ b/charts/library/common/templates/lib/pod/metadata/_labels.tpl
@@ -7,7 +7,7 @@ Returns the value for labels
 
   {{- /* Default labels */ -}}
   {{- $labels := merge
-    (dict "common.bjw-s.dev/controller" $controllerObject.identifier)
+    (dict "app.kubernetes.io/component" $controllerObject.identifier)
   -}}
 
   {{- /* Fetch the Pod selectorLabels */ -}}
diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json
index 15bbcc63..ec06b4e0 100644
--- a/charts/library/common/values.schema.json
+++ b/charts/library/common/values.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.0/charts/library/common/values.schema.json",
+  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.0.1/charts/library/common/values.schema.json",
 
   "type": "object",
   "properties": {