diff --git a/lib/aws/bootstrap/ec2-ssh-keys.j2.tf b/lib/aws/bootstrap/ec2-ssh-keys.j2.tf
index 33213b49..46e9d77a 100644
--- a/lib/aws/bootstrap/ec2-ssh-keys.j2.tf
+++ b/lib/aws/bootstrap/ec2-ssh-keys.j2.tf
@@ -1,4 +1,6 @@
 resource "aws_key_pair" "qovery_ssh_key_{{ kubernetes_cluster_id }}" {
   key_name = var.ec2_ssh_default_key.key_name
   public_key = var.ec2_ssh_default_key.public_key
+
+  tags = local.tags_eks
 }
diff --git a/lib/aws/bootstrap/helm-cluster-autoscaler.tf b/lib/aws/bootstrap/helm-cluster-autoscaler.tf
index 5d1a6062..ef14f0f2 100644
--- a/lib/aws/bootstrap/helm-cluster-autoscaler.tf
+++ b/lib/aws/bootstrap/helm-cluster-autoscaler.tf
@@ -1,5 +1,6 @@
 resource "aws_iam_user" "iam_eks_cluster_autoscaler" {
   name = "qovery-clustauto-${var.kubernetes_cluster_id}"
+  tags = local.tags_eks
 }
 
 resource "aws_iam_access_key" "iam_eks_cluster_autoscaler" {
diff --git a/lib/aws/bootstrap/helm-grafana.tf b/lib/aws/bootstrap/helm-grafana.tf
index 4265c1e6..f8c4a487 100644
--- a/lib/aws/bootstrap/helm-grafana.tf
+++ b/lib/aws/bootstrap/helm-grafana.tf
@@ -1,5 +1,6 @@
 resource "aws_iam_user" "iam_grafana_cloudwatch" {
   name = "qovery-cloudwatch-${var.kubernetes_cluster_id}"
+  tags = local.tags_eks
 }
 
 resource "aws_iam_access_key" "iam_grafana_cloudwatch" {
diff --git a/lib/aws/bootstrap/helm-loki.tf b/lib/aws/bootstrap/helm-loki.tf
index 1568ce4c..02c3771d 100644
--- a/lib/aws/bootstrap/helm-loki.tf
+++ b/lib/aws/bootstrap/helm-loki.tf
@@ -1,5 +1,6 @@
 resource "aws_iam_user" "iam_eks_loki" {
   name = "qovery-logs-${var.kubernetes_cluster_id}"
+  tags = local.tags_eks
 }
 
 resource "aws_iam_access_key" "iam_eks_loki" {