diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml
index 160aee20421d3367b33a108463ca35c4158f734e..d3566e32d47e22fffb23794dd26e88f1a65446c2 100644
--- a/chart/templates/cronjob-media-remove.yaml
+++ b/chart/templates/cronjob-media-remove.yaml
@@ -27,7 +27,7 @@ spec:
               requiredDuringSchedulingIgnoredDuringExecution:
               - labelSelector:
                   matchExpressions:
-                    - key: component
+                    - key: app.kubernetes.io/part-of
                       operator: In
                       values:
                         - rails
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index b2e5af522e5354537679e95d5a23d8806ab5baac..dd707a4d04841030f0fbb8821a0c161f385af37c 100644
--- a/chart/templates/deployment-sidekiq.yaml
+++ b/chart/templates/deployment-sidekiq.yaml
@@ -11,7 +11,8 @@ spec:
   selector:
     matchLabels:
       {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      component: rails
+      app.kubernetes.io/component: sidekiq
+      app.kubernetes.io/part-of: rails
   template:
     metadata:
       annotations:
@@ -22,7 +23,8 @@ spec:
         rollme: {{ randAlphaNum 5 | quote }}
       labels:
         {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        component: rails
+        app.kubernetes.io/component: sidekiq
+        app.kubernetes.io/part-of: rails
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -40,7 +42,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-                - key: component
+                - key: app.kubernetes.io/part-of
                   operator: In
                   values:
                     - rails
diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml
index 12203a530bb4fd80dd6f8ea469e20a56809b2516..7f03c9e23ec3db8e6eb3c6f5d1663c3bd488479a 100644
--- a/chart/templates/deployment-streaming.yaml
+++ b/chart/templates/deployment-streaming.yaml
@@ -11,6 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "mastodon.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: streaming
   template:
     metadata:
     {{- with .Values.podAnnotations }}
@@ -19,6 +20,7 @@ spec:
     {{- end }}
       labels:
         {{- include "mastodon.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: streaming
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml
index c50f32d983484de18abc6c51c348e29705d05ec6..fb58b1ade0049eb5c6046bf2d788bde484a6a566 100644
--- a/chart/templates/deployment-web.yaml
+++ b/chart/templates/deployment-web.yaml
@@ -11,7 +11,8 @@ spec:
   selector:
     matchLabels:
       {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      component: rails
+      app.kubernetes.io/component: web
+      app.kubernetes.io/part-of: rails
   template:
     metadata:
       annotations:
@@ -22,7 +23,8 @@ spec:
         rollme: {{ randAlphaNum 5 | quote }}
       labels:
         {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        component: rails
+        app.kubernetes.io/component: web
+        app.kubernetes.io/part-of: rails
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml
index faa51a20d9d7b8c0f6ba7f11ae3da9cca392f415..9bdec2ab7cf76b1f4b108d1de9f05c9d6c489134 100644
--- a/chart/templates/job-assets-precompile.yaml
+++ b/chart/templates/job-assets-precompile.yaml
@@ -27,7 +27,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-                - key: component
+                - key: app.kubernetes.io/part-of
                   operator: In
                   values:
                     - rails
diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml
index ae6fb38e1296215becbe9d95ace8d2e5dbb8fa14..556133dd32f09918e213b88c24568fb6c8c73818 100644
--- a/chart/templates/job-chewy-upgrade.yaml
+++ b/chart/templates/job-chewy-upgrade.yaml
@@ -28,7 +28,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-                - key: component
+                - key: app.kubernetes.io/part-of
                   operator: In
                   values:
                     - rails
diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml
index 659c00671fc1e7c81a1ffaf4cbeb41dcdcd84fae..94d39dcbb56102b9b7c3426bb63eff2643dee0ee 100644
--- a/chart/templates/job-create-admin.yaml
+++ b/chart/templates/job-create-admin.yaml
@@ -28,7 +28,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-                - key: component
+                - key: app.kubernetes.io/part-of
                   operator: In
                   values:
                     - rails
diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml
index 8e4f70dfb1d03ccbf3ea1259acaaf1f931156e96..e1544d2b66d5b0e08ac1d91ca4edeba0b8559df6 100644
--- a/chart/templates/job-db-migrate.yaml
+++ b/chart/templates/job-db-migrate.yaml
@@ -27,7 +27,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-                - key: component
+                - key: app.kubernetes.io/part-of
                   operator: In
                   values:
                     - rails
diff --git a/chart/templates/service-streaming.yaml b/chart/templates/service-streaming.yaml
index a005e617c373249ba9fb93fbdc1bfe7232a236bd..bade7b1e5193da1f7d5303d9bf194ab615677aa3 100644
--- a/chart/templates/service-streaming.yaml
+++ b/chart/templates/service-streaming.yaml
@@ -13,3 +13,4 @@ spec:
       name: streaming
   selector:
     {{- include "mastodon.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: streaming
diff --git a/chart/templates/service-web.yaml b/chart/templates/service-web.yaml
index 3563fde70138449b1189ccfe783e01bbdec70b75..acf1233dcefe35223e6d9a000b647aa5de289575 100644
--- a/chart/templates/service-web.yaml
+++ b/chart/templates/service-web.yaml
@@ -13,3 +13,4 @@ spec:
       name: http
   selector:
     {{- include "mastodon.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: web