diff --git a/modules/kubernetes/cloudflared/cloudflare.tf b/modules/kubernetes/cloudflared/cloudflare.tf
index fe6fb945..7bf71269 100644
--- a/modules/kubernetes/cloudflared/cloudflare.tf
+++ b/modules/kubernetes/cloudflared/cloudflare.tf
@@ -72,11 +72,12 @@ resource "cloudflare_zero_trust_tunnel_cloudflared_config" "sof" {
 }
 
 resource "cloudflare_record" "dns_record" {
-  # for_each = local.cloudflare_proxied_names_map
-  count   = length(var.cloudflare_proxied_names)
+  # count   = length(var.cloudflare_proxied_names)
+  # name    = var.cloudflare_proxied_names[count.index]
+  for_each = local.cloudflare_proxied_names_map
+  name     = each.key
+
   content = "${var.cloudflare_tunnel_id}.cfargotunnel.com"
-  name    = var.cloudflare_proxied_names[count.index]
-  # name    = each.key
   proxied = true
   ttl     = 1
   type    = "CNAME"
@@ -84,12 +85,13 @@ resource "cloudflare_record" "dns_record" {
 }
 
 resource "cloudflare_record" "non_proxied_dns_record" {
-  # for_each = local.cloudflare_non_proxied_names_map
-  count = length(var.cloudflare_non_proxied_names)
+  # count = length(var.cloudflare_non_proxied_names)
+  # name    = var.cloudflare_non_proxied_names[count.index]
+  for_each = local.cloudflare_non_proxied_names_map
+  name     = each.key
+
   # content = var.non_proxied_names[count.index].ip
   content = var.public_ip
-  name    = var.cloudflare_non_proxied_names[count.index]
-  # name    = each.key
   proxied = false
   ttl     = 1
   type    = "A"
diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf
index dbbf5bf9..808a8f32 100644
--- a/modules/kubernetes/main.tf
+++ b/modules/kubernetes/main.tf
@@ -592,7 +592,9 @@ module "cloudflared" {
   public_ip                    = var.public_ip
   cloudflare_proxied_names     = var.cloudflare_proxied_names
   cloudflare_non_proxied_names = var.cloudflare_non_proxied_names
-  cloudflare_tunnel_token      = var.cloudflare_tunnel_token
+  # cloudflare_proxied_names     = []
+  # cloudflare_non_proxied_names = []
+  cloudflare_tunnel_token = var.cloudflare_tunnel_token
 }
 
 # module "istio" {