diff --git a/charts/ack-factory/Chart.yaml b/charts/ack-factory/Chart.yaml
index 6ed024a9..9781ed18 100644
--- a/charts/ack-factory/Chart.yaml
+++ b/charts/ack-factory/Chart.yaml
@@ -21,7 +21,7 @@ description: An AWS Factory using AWS Controllers for Kubernetes
 home: https://github.com/portefaix/portefaix-hub/charts/ack-factory
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 type: application
-version: 0.3.0
+version: 0.4.0
 appVersion: 1.0.0
 keywords:
   - cloud
@@ -53,4 +53,4 @@ annotations:
   # added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
     - kind: changed
-      description: Kubernetes v1.15 as default value for EKS
+      description: Cleanup labels
diff --git a/charts/ack-factory/templates/_helpers.tpl b/charts/ack-factory/templates/_helpers.tpl
index 1ccb6806..8277be5c 100644
--- a/charts/ack-factory/templates/_helpers.tpl
+++ b/charts/ack-factory/templates/_helpers.tpl
@@ -50,7 +50,6 @@ helm.sh/chart: {{ include "ack-factory.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/component: krm-controller
 app.kubernetes.io/part-of: {{ include "ack-factory.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }} 
 {{- if .Values.additionalLabels }}
diff --git a/charts/ack-factory/templates/ecr.yaml b/charts/ack-factory/templates/ecr.yaml
index b35f5a30..5e6ce737 100644
--- a/charts/ack-factory/templates/ecr.yaml
+++ b/charts/ack-factory/templates/ecr.yaml
@@ -28,6 +28,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ecr
   name: {{ $repoName }}
   namespace: {{ $namespace }}
 spec:
diff --git a/charts/ack-factory/templates/eip.yaml b/charts/ack-factory/templates/eip.yaml
index 220ebe17..d8428364 100644
--- a/charts/ack-factory/templates/eip.yaml
+++ b/charts/ack-factory/templates/eip.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
   name: {{ include "ack-factory.name" . }}
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/eks.yaml b/charts/ack-factory/templates/eks.yaml
index b774bdbc..300c6334 100644
--- a/charts/ack-factory/templates/eks.yaml
+++ b/charts/ack-factory/templates/eks.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: eks
   name: {{ include "ack-factory.name" . }}-eks-cluster
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/gateways.yaml b/charts/ack-factory/templates/gateways.yaml
index 3a24773a..554823d3 100644
--- a/charts/ack-factory/templates/gateways.yaml
+++ b/charts/ack-factory/templates/gateways.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
   name: {{ include "ack-factory.name" . }}
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/iam.yaml b/charts/ack-factory/templates/iam.yaml
index a529b1f5..a4f6c915 100644
--- a/charts/ack-factory/templates/iam.yaml
+++ b/charts/ack-factory/templates/iam.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: iam
   name: {{ include "ack-factory.name" . }}-eks-cluster
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/s3.yaml b/charts/ack-factory/templates/s3.yaml
index 8cf3795d..f418ada2 100644
--- a/charts/ack-factory/templates/s3.yaml
+++ b/charts/ack-factory/templates/s3.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: s3
   name: {{ include "ack-factory.name" . }}
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/sg.yaml b/charts/ack-factory/templates/sg.yaml
index 14318423..e7d42c82 100644
--- a/charts/ack-factory/templates/sg.yaml
+++ b/charts/ack-factory/templates/sg.yaml
@@ -24,6 +24,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" . | nindent 4 }}
+    app.kubernetes.io/component: ec2
   name: {{ include "ack-factory.name" . }}-core
   namespace: {{ template "ack-factory.namespace" . }}
 spec:
diff --git a/charts/ack-factory/templates/subnets.yaml b/charts/ack-factory/templates/subnets.yaml
index 1704d49b..aba47f62 100644
--- a/charts/ack-factory/templates/subnets.yaml
+++ b/charts/ack-factory/templates/subnets.yaml
@@ -28,6 +28,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "ack-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ec2
   name: {{ $subnetName }}
   namespace: {{ $namespace }}
 spec:
diff --git a/charts/ack-factory/templates/vpc.yaml b/charts/ack-factory/templates/vpc.yaml
index ee161659..60c78e8a 100644
--- a/charts/ack-factory/templates/vpc.yaml
+++ b/charts/ack-factory/templates/vpc.yaml
@@ -18,6 +18,9 @@
 apiVersion: ec2.services.k8s.aws/v1alpha1
 kind: VPC
 metadata:
+  labels:
+    {{- include "ack-factory.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: ec2
   name: {{ include "ack-factory.name" . }}
 spec:
   cidrBlocks: