diff --git a/charts/rails-application/Chart.yaml b/charts/rails-application/Chart.yaml
index 3e948be..22fad3c 100644
--- a/charts/rails-application/Chart.yaml
+++ b/charts/rails-application/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: rails-application
 description: Base chart for my rails applications
 type: application
-version: "0.1.0-alpha2"
+version: "0.1.0-alpha3"
diff --git a/charts/rails-application/templates/deployment.yaml b/charts/rails-application/templates/deployment.yaml
index b0d6f7d..ac41570 100644
--- a/charts/rails-application/templates/deployment.yaml
+++ b/charts/rails-application/templates/deployment.yaml
@@ -11,6 +11,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
+      app.kubernetes.io/component: {{ $deploymentName }}
       {{- include "rails-application.selectorLabels" $ | nindent 6 }}
   template:
     metadata:
@@ -19,7 +20,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        "k8s.klaus-meyer.net/deployment-type": {{ $deploymentName }}
+        app.kubernetes.io/component: {{ $deploymentName }}
         {{- include "rails-application.labels" $ | nindent 8 }}
         {{- with $.Values.podLabels }}
         {{- toYaml . | nindent 8 }}
diff --git a/charts/rails-application/templates/service.yaml b/charts/rails-application/templates/service.yaml
index e07e2b2..4664276 100644
--- a/charts/rails-application/templates/service.yaml
+++ b/charts/rails-application/templates/service.yaml
@@ -12,5 +12,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    k8s.klaus-meyer.net/deployment-type: web
+    app.kubernetes.io/component: web
     {{- include "rails-application.selectorLabels" . | nindent 4 }}