diff --git a/charts/crossplane-aws-factory/Chart.yaml b/charts/crossplane-aws-factory/Chart.yaml
index 7bc94414..04aa7c8d 100644
--- a/charts/crossplane-aws-factory/Chart.yaml
+++ b/charts/crossplane-aws-factory/Chart.yaml
@@ -21,7 +21,7 @@ description: An AWS Factory using Crossplane
 home: https://github.com/portefaix/portefaix-hub/charts/crossplane-aws-factory
 icon: https://crossplane.io/images/favicon_192x192.png
 type: application
-version: 0.5.1
+version: 0.6.0
 appVersion: 1.0.0
 keywords:
   - cloud
@@ -53,4 +53,4 @@ annotations:
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Additional labels and annotations
+      description: Cleanup labels
diff --git a/charts/crossplane-aws-factory/templates/_helpers.tpl b/charts/crossplane-aws-factory/templates/_helpers.tpl
index 37611ce3..f8a54d62 100644
--- a/charts/crossplane-aws-factory/templates/_helpers.tpl
+++ b/charts/crossplane-aws-factory/templates/_helpers.tpl
@@ -50,7 +50,6 @@ helm.sh/chart: {{ include "crossplane-aws-factory.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/component: crossplane-factory
 app.kubernetes.io/part-of: {{ include "crossplane-aws-factory.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 crossplane.io/version: {{ .Values.crossplane.version }}
diff --git a/charts/crossplane-aws-factory/templates/aws-config.yaml b/charts/crossplane-aws-factory/templates/aws-config.yaml
index 40aea166..6a3b7eb5 100644
--- a/charts/crossplane-aws-factory/templates/aws-config.yaml
+++ b/charts/crossplane-aws-factory/templates/aws-config.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/aws-controller-config.yaml b/charts/crossplane-aws-factory/templates/aws-controller-config.yaml
index ae7c616a..be58201f 100644
--- a/charts/crossplane-aws-factory/templates/aws-controller-config.yaml
+++ b/charts/crossplane-aws-factory/templates/aws-controller-config.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/aws-provider.yaml b/charts/crossplane-aws-factory/templates/aws-provider.yaml
index b67fd4c9..9e14aa9b 100644
--- a/charts/crossplane-aws-factory/templates/aws-provider.yaml
+++ b/charts/crossplane-aws-factory/templates/aws-provider.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: provider
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/ecr.yaml b/charts/crossplane-aws-factory/templates/ecr.yaml
index 38932265..272a38f3 100644
--- a/charts/crossplane-aws-factory/templates/ecr.yaml
+++ b/charts/crossplane-aws-factory/templates/ecr.yaml
@@ -27,6 +27,7 @@ metadata:
   namespace: {{ $namespace }}
   labels:
     {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ecr
   {{- with $.Values.additionalAnnotations }}
   annotations:
   {{ toYaml . | indent 4 }}
@@ -49,6 +50,8 @@ kind: RepositoryPolicy
 metadata:
   name: {{ $repoName }}
   labels:
+    {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ecr
     region: {{ $region }}
 spec:
   forProvider:
@@ -71,6 +74,9 @@ spec:
 apiVersion: ecr.aws.crossplane.io/v1alpha1
 kind: LifecyclePolicy
 metadata:
+  labels:
+    {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ecr
   name: {{ $repoName }}
 spec:
   forProvider:
diff --git a/charts/crossplane-aws-factory/templates/eks.yaml b/charts/crossplane-aws-factory/templates/eks.yaml
index f8ab9653..3a6afd25 100644
--- a/charts/crossplane-aws-factory/templates/eks.yaml
+++ b/charts/crossplane-aws-factory/templates/eks.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: eks
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -67,6 +68,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: eks
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -110,6 +112,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: eks
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/iam-eks.yaml b/charts/crossplane-aws-factory/templates/iam-eks.yaml
index 7cad3c97..42f78113 100644
--- a/charts/crossplane-aws-factory/templates/iam-eks.yaml
+++ b/charts/crossplane-aws-factory/templates/iam-eks.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -69,6 +70,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -113,6 +115,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -135,6 +138,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -157,6 +161,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -179,6 +184,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -201,6 +207,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/internet-gateway.yaml b/charts/crossplane-aws-factory/templates/internet-gateway.yaml
index bc3a07b6..897667ae 100644
--- a/charts/crossplane-aws-factory/templates/internet-gateway.yaml
+++ b/charts/crossplane-aws-factory/templates/internet-gateway.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -52,6 +53,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/nat-gateway.yaml b/charts/crossplane-aws-factory/templates/nat-gateway.yaml
index e6c140ec..4ff2e935 100644
--- a/charts/crossplane-aws-factory/templates/nat-gateway.yaml
+++ b/charts/crossplane-aws-factory/templates/nat-gateway.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -51,6 +52,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/sg.yaml b/charts/crossplane-aws-factory/templates/sg.yaml
index 12274755..8848259a 100644
--- a/charts/crossplane-aws-factory/templates/sg.yaml
+++ b/charts/crossplane-aws-factory/templates/sg.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -56,6 +57,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/sns.yaml b/charts/crossplane-aws-factory/templates/sns.yaml
index 9635405e..4d9e1b52 100644
--- a/charts/crossplane-aws-factory/templates/sns.yaml
+++ b/charts/crossplane-aws-factory/templates/sns.yaml
@@ -27,6 +27,7 @@ metadata:
   namespace: {{ $namespace }}
   labels:
     {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: sns
   {{- with $.Values.additionalAnnotations }}
   annotations:
   {{ toYaml . | indent 4 }}
@@ -56,6 +57,7 @@ metadata:
   namespace: {{ $namespace }}
   labels:
     {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: sns
   {{- with $.Values.additionalAnnotations }}
   annotations:
   {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/sqs.yaml b/charts/crossplane-aws-factory/templates/sqs.yaml
index de01913e..fdac55df 100644
--- a/charts/crossplane-aws-factory/templates/sqs.yaml
+++ b/charts/crossplane-aws-factory/templates/sqs.yaml
@@ -27,6 +27,7 @@ metadata:
   namespace: {{ $namespace }}
   labels:
     {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: sqs
   {{- with $.Values.additionalAnnotations }}
   annotations:
   {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/subnets.yaml b/charts/crossplane-aws-factory/templates/subnets.yaml
index 775d0399..fa1bcec6 100644
--- a/charts/crossplane-aws-factory/templates/subnets.yaml
+++ b/charts/crossplane-aws-factory/templates/subnets.yaml
@@ -27,6 +27,7 @@ metadata:
   namespace: {{ $namespace }}
   labels:
     {{- include "crossplane-aws-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with $.Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/templates/vpc.yaml b/charts/crossplane-aws-factory/templates/vpc.yaml
index b37794d3..07a81f43 100644
--- a/charts/crossplane-aws-factory/templates/vpc.yaml
+++ b/charts/crossplane-aws-factory/templates/vpc.yaml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ template "crossplane-aws-factory.namespace" . }}
   labels:
     {{- include "crossplane-aws-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
 {{- with .Values.additionalAnnotations }}
   annotations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/crossplane-aws-factory/values.yaml b/charts/crossplane-aws-factory/values.yaml
index 46fdb0e5..d112b766 100644
--- a/charts/crossplane-aws-factory/values.yaml
+++ b/charts/crossplane-aws-factory/values.yaml
@@ -147,7 +147,7 @@ aws:
       - name: poc
         tags:
           Service: SNS
-    # -- SNS Subscriptions
+    # -- SNS Subscriptions
     subscriptions:
       - name: poc
         topicName: poc
@@ -155,4 +155,3 @@ aws:
         endpoint: john.doe@gmail.com
         tags:
           Service: SNS
-  
\ No newline at end of file