diff --git a/eks_console_access.tf b/eks_console_access.tf
index 61e378f..9d6dfed 100644
--- a/eks_console_access.tf
+++ b/eks_console_access.tf
@@ -26,11 +26,12 @@ locals {
   ]
   cluster_roles_map = { for cr in local.cluster_roles : cr.name => cr if cr.enabled }
   # roles = provider::kubernetes::manifest_decode_multi(data.http.cluster_roles[each.key].body)
+  manifest_doc = { for crm in local.cluster_roles_map : data.http.cluster_roles[crm.key].body => crm }
 }
 
 # Fetch the YAML files from the specified URLs
 data "http" "cluster_roles" {
-  for_each = { for cr in local.cluster_roles : cr.name => cr if cr.enabled }
+  for_each = local.cluster_roles_map
   url      = each.value.url
 }
 
@@ -47,7 +48,7 @@ data "http" "cluster_roles" {
 # Apply the Kubernetes manifests to the cluster
 resource "kubernetes_manifest" "deploy_cluster_roles" {
   for_each = local.cluster_roles_map
-  manifest = { for manifest in provider::kubernetes::manifest_decode_multi("${data.http.cluster_roles[each.key].body}") : lower("${manifest.kind}-${manifest.metadata.name}") => manifest }
+  manifest = { for manifest in provider::kubernetes::manifest_decode_multi(local.manifest_doc) : lower("${manifest.kind}-${manifest.metadata.name}") => manifest }
 
   wait {
     rollout = true