diff --git a/armonik/README.md b/armonik/README.md
index 74cfe2120..d8ae5fbab 100644
--- a/armonik/README.md
+++ b/armonik/README.md
@@ -131,7 +131,7 @@
 | <a name="input_metrics_server_chart_name"></a> [metrics\_server\_chart\_name](#input\_metrics\_server\_chart\_name) | Name of the metrics-server Helm chart | `string` | `"metrics-server"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace of ArmoniK resources | `string` | n/a | yes |
 | <a name="input_partition_metrics_exporter_secret_name"></a> [partition\_metrics\_exporter\_secret\_name](#input\_partition\_metrics\_exporter\_secret\_name) | the name of the partition metrics exporter secret | `string` | `"partition-metrics-exporter"` | no |
-| <a name="input_pod_deletion_cost"></a> [pod\_deletion\_cost](#input\_pod\_deletion\_cost) | value | <pre>object({<br>    image               = string<br>    tag                 = string<br>    image_pull_policy   = optional(string, "IfNotPresent")<br>    image_pull_secrets  = optional(string, "")<br>    node_selector       = optional(any, {})<br>    annotations         = optional(any, {})<br>    name                = optional(string, "pdc-update")<br>    label_app           = optional(string, "armonik")<br>    prometheus_url      = optional(string)<br>    metrics_name        = optional(string)<br>    frequency           = optional(number)<br>    ignore_younger_than = optional(number)<br>    concurrency         = optional(number)<br>    extra_conf          = optional(map(string), {})<br><br>    limits = optional(object({<br>      cpu    = optional(string)<br>      memory = optional(string)<br>    }))<br>    requests = optional(object({<br>      cpu    = optional(string)<br>      memory = optional(string)<br>    }))<br>  })</pre> | `null` | no |
+| <a name="input_pod_deletion_cost"></a> [pod\_deletion\_cost](#input\_pod\_deletion\_cost) | value | <pre>object({<br>    image               = string<br>    tag                 = string<br>    image_pull_policy   = optional(string, "IfNotPresent")<br>    image_pull_secrets  = optional(string, "")<br>    node_selector       = optional(any, {})<br>    annotations         = optional(any, {})<br>    name                = optional(string, "pdc-update")<br>    label_app           = optional(string, "armonik")<br>    prometheus_url      = optional(string)<br>    metrics_name        = optional(string)<br>    period              = optional(number)<br>    ignore_younger_than = optional(number)<br>    concurrency         = optional(number)<br>    extra_conf          = optional(map(string), {})<br><br>    limits = optional(object({<br>      cpu    = optional(string)<br>      memory = optional(string)<br>    }))<br>    requests = optional(object({<br>      cpu    = optional(string)<br>      memory = optional(string)<br>    }))<br>  })</pre> | `null` | no |
 | <a name="input_prometheus_secret_name"></a> [prometheus\_secret\_name](#input\_prometheus\_secret\_name) | the name of the prometheus secret | `string` | `"prometheus"` | no |
 | <a name="input_pvc_name"></a> [pvc\_name](#input\_pvc\_name) | Name for the pvc to be used | `string` | `"nfsvolume"` | no |
 | <a name="input_s3_secret_name"></a> [s3\_secret\_name](#input\_s3\_secret\_name) | the name of the S3 secret | `string` | `"s3"` | no |
diff --git a/armonik/pdc.tf b/armonik/pdc.tf
index 5e6819d66..19fb195c5 100644
--- a/armonik/pdc.tf
+++ b/armonik/pdc.tf
@@ -1,11 +1,10 @@
 locals {
   pdc_env = var.pod_deletion_cost != null ? merge({
-    PrometheusUrl       = coalesce(var.pod_deletion_cost.prometheus_url, "http://prometheus.${var.namespace}.svc:9090/")
-    MetricsName         = var.pod_deletion_cost.metrics_name
-    Period              = var.pod_deletion_cost.period
-    IgnoreYoungerThan   = var.pod_deletion_cost.ignore_younger_than
-    KubernetesNamespace = var.namespace
-    Concurrency         = var.pod_deletion_cost.concurrency
+    PrometheusUrl     = coalesce(var.pod_deletion_cost.prometheus_url, "http://prometheus.${var.namespace}.svc:9090/")
+    MetricsName       = var.pod_deletion_cost.metrics_name
+    Period            = var.pod_deletion_cost.period
+    IgnoreYoungerThan = var.pod_deletion_cost.ignore_younger_than
+    Concurrency       = var.pod_deletion_cost.concurrency
   }, var.pod_deletion_cost.extra_conf) : {}
 }
 
diff --git a/images/pdc-update/src/main.rs b/images/pdc-update/src/main.rs
index 6653a062c..f68f40a67 100644
--- a/images/pdc-update/src/main.rs
+++ b/images/pdc-update/src/main.rs
@@ -38,10 +38,6 @@ struct Cli {
     #[arg(short, long, env = "IgnoreYoungerThan", default_value_t = 10.0)]
     ignore_younger_than: f64,
 
-    /// Namespace where the pods are located
-    #[arg(short, long, env = "KubernetesNamespace", default_value = "default")]
-    namespace: String,
-
     /// Number of concurrent requests to Kubernetes
     #[arg(short, long, env = "Concurrency", default_value_t = 10)]
     concurrency: u32,
@@ -54,12 +50,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 
     let cost_model: Box<dyn CostModel> =
         Box::new(cost::age::AgeCost::new(cli.ignore_younger_than, 1.0));
-    let metrics_scraper: Box<dyn MetricsScraper> =
-        Box::new(metrics::prometheus::PrometheusScraper::new(
-            &cli.prometheus_url,
-            &cli.metrics_name,
-            &cli.namespace,
-        )?);
+    let metrics_scraper: Box<dyn MetricsScraper> = Box::new(
+        metrics::prometheus::PrometheusScraper::new(&cli.prometheus_url, &cli.metrics_name)?,
+    );
     let worker_updater: Box<dyn WorkerUpdater + Sync> =
         Box::new(updater::pod::PodUpdater::new(cli.concurrency as usize).await?);
     let mut cost_map = HashMap::new();
diff --git a/images/pdc-update/src/metrics/prometheus.rs b/images/pdc-update/src/metrics/prometheus.rs
index 870106f62..86046e7c3 100644
--- a/images/pdc-update/src/metrics/prometheus.rs
+++ b/images/pdc-update/src/metrics/prometheus.rs
@@ -7,8 +7,6 @@ use super::{MetricsScraper, MetricsValue};
 pub struct PrometheusScraper {
     /// Query URL for Prometheus
     query: reqwest::Url,
-    /// Namespace of the workers
-    namespace: String,
 }
 
 impl PrometheusScraper {
@@ -16,14 +14,10 @@ impl PrometheusScraper {
     pub fn new(
         url: &str,
         metrics_name: &str,
-        namespace: &str,
     ) -> Result<Self, Box<dyn std::error::Error + Send + Sync>> {
         let mut query = reqwest::Url::parse(url)?.join("api/v1/query")?;
         query.query_pairs_mut().append_pair("query", metrics_name);
-        Ok(Self {
-            query,
-            namespace: namespace.to_owned(),
-        })
+        Ok(Self { query })
     }
 }
 
@@ -63,7 +57,7 @@ impl MetricsScraper for PrometheusScraper {
 
                 Some(MetricsValue {
                     name: result.metric.kubernetes_pod_name.to_owned(),
-                    namespace: self.namespace.clone(),
+                    namespace: result.metric.kubernetes_namespace.to_owned(),
                     timestamp: result.value.0,
                     value,
                 })
@@ -106,6 +100,7 @@ struct PrometheusMetric<'a> {
     name: &'a str,
     instance: &'a str,
     job: &'a str,
+    kubernetes_namespace: &'a str,
     kubernetes_pod_name: &'a str,
     kubernetes_pod_node_name: &'a str,
 }
diff --git a/monitoring/onpremise/prometheus/prometheus-configmap.tf b/monitoring/onpremise/prometheus/prometheus-configmap.tf
index 60351ea3b..6054b796f 100644
--- a/monitoring/onpremise/prometheus/prometheus-configmap.tf
+++ b/monitoring/onpremise/prometheus/prometheus-configmap.tf
@@ -119,6 +119,9 @@ scrape_configs:
       - source_labels: [__meta_kubernetes_pod_label_service]
         action: keep
         regex: "control-plane"
+      - source_labels: [__meta_kubernetes_namespace]
+        action: replace
+        target_label: kubernetes_namespace
       - source_labels: [__meta_kubernetes_pod_node_name]
         action: replace
         target_label: kubernetes_pod_node_name
@@ -139,6 +142,9 @@ scrape_configs:
       - source_labels: [__meta_kubernetes_pod_label_service]
         action: keep
         regex: "compute-plane"
+      - source_labels: [__meta_kubernetes_namespace]
+        action: replace
+        target_label: kubernetes_namespace
       - source_labels: [__meta_kubernetes_pod_node_name]
         action: replace
         target_label: kubernetes_pod_node_name