diff --git a/main.tf b/main.tf
index 6f63a0e..a28532c 100644
--- a/main.tf
+++ b/main.tf
@@ -1,20 +1,20 @@
 
 locals {
-  alertmanager_internal_hostname    = format("prometheus-alertmanager.%v.svc.cluster.local", local.ns)
+  alertmanager_internal_hostname    = format("prometheus-alertmanager.%v.svc.cluster.local", kubernetes_namespace.ns.metadata.name)
   alertmanager_internal_port_number = 9093
   alertmanager_internal_url         = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number)
 
-  headless_alertmanager_internal_hostname    = format("prometheus-alertmanager-headless.%v.svc.cluster.local", local.ns)
+  headless_alertmanager_internal_hostname    = format("prometheus-alertmanager-headless.%v.svc.cluster.local", kubernetes_namespace.ns.metadata.name)
   headless_alertmanager_internal_port_number = 9093
   headless_alertmanager_internal_url         = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number)
 
   # ns = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.existing_ns[0].metadata[0].name)
 
-  pushgateway_internal_hostname    = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", local.ns)
+  pushgateway_internal_hostname    = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", kubernetes_namespace.ns.metadata.name)
   pushgateway_internal_port_number = 9091
   pushgateway_internal_url         = format("http://%v:%v/", local.pushgateway_internal_hostname, local.pushgateway_internal_port_number)
 
-  server_internal_hostname    = format("prometheus-server.%v.svc.cluster.local", local.ns)
+  server_internal_hostname    = format("prometheus-server.%v.svc.cluster.local", kubernetes_namespace.ns.metadata.name)
   server_internal_port_number = 9090
   server_internal_url         = format("http://%v:%v/", local.server_internal_hostname, local.server_internal_port_number)
 }
@@ -35,7 +35,7 @@ resource "helm_release" "prometheus" {
   ]
   chart      = "prometheus"
   name       = "prometheus"
-  namespace  = kubernetes_namespace.ns[0].metadata[0].name
+  namespace  = kubernetes_namespace.ns.metadata.name
   version    = var.prometheus_chart_version
   repository = "https://prometheus-community.github.io/helm-charts"
 
diff --git a/outputs.tf b/outputs.tf
index e047fe6..569df86 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -36,7 +36,7 @@ output "prometheus_server_internal_endpoint" {
 
 output "prometheus_namespace" {
   description = "namespace for prometheus"
-  value       = local.ns
+  value       = kubernetes_namespace.ns.metadata.name
 }
 
 ################################################################################