diff --git a/README.md b/README.md
index 2b75d13..b92729e 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@ Developer NOTE: We should automate this configuration.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.14.0 |
-| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | >= 5.14.0 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.11.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.0.0 |
+| <a name="provider_aws.eecr"></a> [aws.eecr](#provider\_aws.eecr) | 6.0.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 3.0.2 |
+| <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
 | <a name="provider_terraform"></a> [terraform](#provider\_terraform) | n/a |
 
 ## Modules
diff --git a/main.tf b/main.tf
index 4515b8f..d1ec87e 100644
--- a/main.tf
+++ b/main.tf
@@ -51,44 +51,44 @@ resource "helm_release" "tempo" {
   wait             = true
   timeout          = 300
 
-  set {
+  set = [{
     name  = "replicas"
     value = "1"
-  }
-  set {
-    name = "tempo.repository"
-    value = format("%v/%v",
-      module.images.images[local.tempo_key].dest_registry,
-      module.images.images[local.tempo_key].dest_repository
-    )
-  }
-  set {
-    name  = "tempo.tag"
-    value = var.tempo_tag
-  }
-  set {
-    name  = "tempo.storage.trace.s3.bucket"
-    value = module.tempo_s3.s3_bucket_id
-  }
-  set {
-    name  = "tempo.storage.trace.s3.endpoint"
-    value = "s3.${var.region}.amazonaws.com"
-  }
-  set {
-    name  = "tempo.metricsGenerator.enabled"
-    value = true
-  }
-  set {
-    name  = "tempo.metricsGenerator.remoteWriteUrl"
-    value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write"
-  }
-  set {
-    name  = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
-    value = module.tempo-irsa-role.iam_role_arn
-  }
-  set {
-    name  = "persistence.storageClassName"
-    value = var.rwo_storage_class
-  }
-
+    },
+    {
+      name = "tempo.repository"
+      value = format("%v/%v",
+        module.images.images[local.tempo_key].dest_registry,
+        module.images.images[local.tempo_key].dest_repository
+      )
+    },
+    {
+      name  = "tempo.tag"
+      value = var.tempo_tag
+    },
+    {
+      name  = "tempo.storage.trace.s3.bucket"
+      value = module.tempo_s3.s3_bucket_id
+    },
+    {
+      name  = "tempo.storage.trace.s3.endpoint"
+      value = "s3.${var.region}.amazonaws.com"
+    },
+    {
+      name  = "tempo.metricsGenerator.enabled"
+      value = true
+    },
+    {
+      name  = "tempo.metricsGenerator.remoteWriteUrl"
+      value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write"
+    },
+    {
+      name  = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
+      value = module.tempo-irsa-role.iam_role_arn
+    },
+    {
+      name  = "persistence.storageClassName"
+      value = var.rwo_storage_class
+    }
+  ]
 }