diff --git a/charts/cryostat/templates/cryostat_deployment.yaml b/charts/cryostat/templates/cryostat_deployment.yaml
index 0bbfbde..7499518 100644
--- a/charts/cryostat/templates/cryostat_deployment.yaml
+++ b/charts/cryostat/templates/cryostat_deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ include "cryostat.fullname" . }}
   labels:
     {{- include "cryostat.labels" . | nindent 4 }}
-    component: cryostat
+    app.kubernetes.io/component: cryostat
 spec:
   replicas: 1
   strategy:
@@ -14,7 +14,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cryostat.selectorLabels" . | nindent 6 }}
-      component: cryostat
+      app.kubernetes.io/component: cryostat
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -23,7 +23,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cryostat.selectorLabels" . | nindent 8 }}
-        component: cryostat
+        app.kubernetes.io/component: cryostat
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/cryostat/templates/cryostat_service.yaml b/charts/cryostat/templates/cryostat_service.yaml
index 41e6f32..74aea0f 100644
--- a/charts/cryostat/templates/cryostat_service.yaml
+++ b/charts/cryostat/templates/cryostat_service.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "cryostat.labels" $ | nindent 4 }}
-    component: cryostat
+    app.kubernetes.io/component: cryostat
   {{- if (.Values.authentication.openshift).enabled }}
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: {{ .Release.Name }}-proxy-tls
@@ -26,4 +26,4 @@ spec:
     {{- end }}
   selector:
     {{- include "cryostat.selectorLabels" $ | nindent 4 }}
-    component: cryostat
+    app.kubernetes.io/component: cryostat
diff --git a/charts/cryostat/templates/db_deployment.yaml b/charts/cryostat/templates/db_deployment.yaml
index a3fa69e..f189131 100644
--- a/charts/cryostat/templates/db_deployment.yaml
+++ b/charts/cryostat/templates/db_deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ include "cryostat.fullname" . }}-db
   labels:
     {{- include "cryostat.labels" . | nindent 4 }}
-    component: db
+    app.kubernetes.io/component: db
 spec:
   replicas: 1
   strategy:
@@ -14,7 +14,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cryostat.selectorLabels" . | nindent 6 }}
-      component: db
+      app.kubernetes.io/component: db
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -23,7 +23,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cryostat.selectorLabels" . | nindent 8 }}
-        component: db
+        app.kubernetes.io/component: db
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/cryostat/templates/db_service.yaml b/charts/cryostat/templates/db_service.yaml
index 869dd26..402e189 100644
--- a/charts/cryostat/templates/db_service.yaml
+++ b/charts/cryostat/templates/db_service.yaml
@@ -6,11 +6,11 @@ metadata:
   name: {{ $fullName }}-db
   labels:
     {{- include "cryostat.labels" $ | nindent 4 }}
-    component: db
+    app.kubernetes.io/component: db
 spec:
   type: {{ .Values.db.service.type }}
   ports:
     - port: {{ .Values.db.service.port }}
   selector:
     {{- include "cryostat.selectorLabels" $ | nindent 4 }}
-    component: db
+    app.kubernetes.io/component: db
diff --git a/charts/cryostat/templates/reports_deployment.yaml b/charts/cryostat/templates/reports_deployment.yaml
index 55bc57c..738edc9 100644
--- a/charts/cryostat/templates/reports_deployment.yaml
+++ b/charts/cryostat/templates/reports_deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   name: {{ include "cryostat.fullname" . }}-reports
   labels:
     {{- include "cryostat.labels" . | nindent 4 }}
-    component: reports
+    app.kubernetes.io/component: reports
 spec:
   replicas: {{ .Values.reports.replicas }}
   strategy:
@@ -15,7 +15,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cryostat.selectorLabels" . | nindent 6 }}
-      component: reports
+      app.kubernetes.io/component: reports
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -24,7 +24,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cryostat.selectorLabels" . | nindent 8 }}
-        component: reports
+        app.kubernetes.io/component: reports
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/cryostat/templates/reports_service.yaml b/charts/cryostat/templates/reports_service.yaml
index cc2f8b6..5cdc994 100644
--- a/charts/cryostat/templates/reports_service.yaml
+++ b/charts/cryostat/templates/reports_service.yaml
@@ -13,5 +13,5 @@ spec:
     - port: {{ .Values.reports.service.httpPort }}
   selector:
     {{- include "cryostat.selectorLabels" $ | nindent 4 }}
-    component: reports
+    app.kubernetes.io/component: reports
 {{- end -}}
diff --git a/charts/cryostat/templates/storage_deployment.yaml b/charts/cryostat/templates/storage_deployment.yaml
index 01afbba..0a3118f 100644
--- a/charts/cryostat/templates/storage_deployment.yaml
+++ b/charts/cryostat/templates/storage_deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ include "cryostat.fullname" . }}-storage
   labels:
     {{- include "cryostat.labels" . | nindent 4 }}
-    component: storage
+    app.kubernetes.io/component: storage
 spec:
   replicas: 1
   strategy:
@@ -14,7 +14,7 @@ spec:
   selector:
     matchLabels:
       {{- include "cryostat.selectorLabels" . | nindent 6 }}
-      component: storage
+      app.kubernetes.io/component: storage
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -23,7 +23,7 @@ spec:
       {{- end }}
       labels:
         {{- include "cryostat.selectorLabels" . | nindent 8 }}
-        component: storage
+        app.kubernetes.io/component: storage
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/cryostat/templates/storage_service.yaml b/charts/cryostat/templates/storage_service.yaml
index a0cd8d6..0d074d0 100644
--- a/charts/cryostat/templates/storage_service.yaml
+++ b/charts/cryostat/templates/storage_service.yaml
@@ -6,11 +6,11 @@ metadata:
   name: {{ $fullName }}-storage
   labels:
     {{- include "cryostat.labels" $ | nindent 4 }}
-    component: storage
+    app.kubernetes.io/component: storage
 spec:
   type: {{ .Values.storage.service.type }}
   ports:
     - port: {{ .Values.storage.service.port }}
   selector:
     {{- include "cryostat.selectorLabels" $ | nindent 4 }}
-    component: storage
+    app.kubernetes.io/component: storage
diff --git a/charts/cryostat/tests/cryostat_deployment_test.yaml b/charts/cryostat/tests/cryostat_deployment_test.yaml
index 3bbc442..fe1c2d7 100644
--- a/charts/cryostat/tests/cryostat_deployment_test.yaml
+++ b/charts/cryostat/tests/cryostat_deployment_test.yaml
@@ -22,13 +22,13 @@ tests:
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: cryostat
+            app.kubernetes.io/component: cryostat
       - equal:
           path: spec.template.metadata.labels
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: cryostat
+            app.kubernetes.io/component: cryostat
       - equal:
           path: spec.template.spec.serviceAccountName
           value: RELEASE-NAME-cryostat
@@ -46,7 +46,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.0.0-dev"
             app.kubernetes.io/managed-by: Helm
-            component: cryostat
+            app.kubernetes.io/component: cryostat
 
   - it: should validate all container settings including environment variables and security contexts
     asserts:
diff --git a/charts/cryostat/tests/cryostat_service_test.yaml b/charts/cryostat/tests/cryostat_service_test.yaml
index 63e2c7d..1cc5312 100644
--- a/charts/cryostat/tests/cryostat_service_test.yaml
+++ b/charts/cryostat/tests/cryostat_service_test.yaml
@@ -40,7 +40,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: cryostat
+            app.kubernetes.io/component: cryostat
 
   - it: should create a Service with the correct settings when OpenShift authentication is enabled
     set:
@@ -86,7 +86,7 @@ tests:
           value:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/instance: RELEASE-NAME
-            component: cryostat
+            app.kubernetes.io/component: cryostat
       - equal:
           path: metadata.labels
           value:
@@ -95,7 +95,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: cryostat
+            app.kubernetes.io/component: cryostat
       - equal:
           path: metadata.annotations
           value:
diff --git a/charts/cryostat/tests/db_deployment_test.yaml b/charts/cryostat/tests/db_deployment_test.yaml
index 42dd151..76b0036 100644
--- a/charts/cryostat/tests/db_deployment_test.yaml
+++ b/charts/cryostat/tests/db_deployment_test.yaml
@@ -22,13 +22,13 @@ tests:
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: db
+            app.kubernetes.io/component: db
       - equal:
           path: spec.template.metadata.labels
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: db
+            app.kubernetes.io/component: db
       - equal:
           path: spec.template.spec.serviceAccountName
           value: RELEASE-NAME-cryostat
@@ -46,7 +46,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.0.0-dev"
             app.kubernetes.io/managed-by: Helm
-            component: db
+            app.kubernetes.io/component: db
 
   - it: should validate cryostat-db settings
     asserts:
diff --git a/charts/cryostat/tests/db_service_test.yaml b/charts/cryostat/tests/db_service_test.yaml
index 6a7b6b4..69c162e 100644
--- a/charts/cryostat/tests/db_service_test.yaml
+++ b/charts/cryostat/tests/db_service_test.yaml
@@ -27,7 +27,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: db
+            app.kubernetes.io/component: db
 
   - it: should create a Service with the correct settings overrides
     set:
@@ -56,4 +56,4 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: db
+            app.kubernetes.io/component: db
diff --git a/charts/cryostat/tests/reports_deployment_test.yaml b/charts/cryostat/tests/reports_deployment_test.yaml
index 2c21ae2..1939297 100644
--- a/charts/cryostat/tests/reports_deployment_test.yaml
+++ b/charts/cryostat/tests/reports_deployment_test.yaml
@@ -30,13 +30,13 @@ tests:
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: reports
+            app.kubernetes.io/component: reports
       - equal:
           path: spec.template.metadata.labels
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: reports
+            app.kubernetes.io/component: reports
       - equal:
           path: spec.template.spec.serviceAccountName
           value: RELEASE-NAME-cryostat
@@ -54,7 +54,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.0.0-dev"
             app.kubernetes.io/managed-by: Helm
-            component: reports
+            app.kubernetes.io/component: reports
 
   - it: should validate all container settings including environment variables and security contexts
     set:
diff --git a/charts/cryostat/tests/storage_deployment_test.yaml b/charts/cryostat/tests/storage_deployment_test.yaml
index adc4e7d..0234927 100644
--- a/charts/cryostat/tests/storage_deployment_test.yaml
+++ b/charts/cryostat/tests/storage_deployment_test.yaml
@@ -22,13 +22,13 @@ tests:
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: storage
+            app.kubernetes.io/component: storage
       - equal:
           path: spec.template.metadata.labels
           value:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: cryostat
-            component: storage
+            app.kubernetes.io/component: storage
       - equal:
           path: spec.template.spec.serviceAccountName
           value: RELEASE-NAME-cryostat
@@ -46,7 +46,7 @@ tests:
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/version: "4.0.0-dev"
             app.kubernetes.io/managed-by: Helm
-            component: storage
+            app.kubernetes.io/component: storage
 
   - it: should validate cryostat-storage settings
     asserts:
diff --git a/charts/cryostat/tests/storage_service_test.yaml b/charts/cryostat/tests/storage_service_test.yaml
index 02f811a..ec0c9fe 100644
--- a/charts/cryostat/tests/storage_service_test.yaml
+++ b/charts/cryostat/tests/storage_service_test.yaml
@@ -27,7 +27,7 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: storage
+            app.kubernetes.io/component: storage
 
   - it: should create a Service with the correct settings overrides
     set:
@@ -57,4 +57,4 @@ tests:
             app.kubernetes.io/name: cryostat
             app.kubernetes.io/version: "4.0.0-dev"
             helm.sh/chart: cryostat-2.0.0-dev
-            component: storage
+            app.kubernetes.io/component: storage