diff --git a/charts/base-cluster/templates/flux/rules/flux-status.yaml b/charts/base-cluster/templates/flux/rules/flux-status.yaml
index 5141f86b1f..1bb12d18a3 100644
--- a/charts/base-cluster/templates/flux/rules/flux-status.yaml
+++ b/charts/base-cluster/templates/flux/rules/flux-status.yaml
@@ -18,20 +18,20 @@ spec:
       rules:
         - alert: ResourcesFailing
           annotations:
-            description: {{ "Resource {{ $labels.customresource_kind }}/{{ $labels.exported_namespace }}/{{ $labels.name }} has been in a failed state for longer than 10 minutes." | quote }}
+            description: {{ "Resource {{ $labels.customresource_kind }}/{{ $labels.customresource_namespace }}/{{ $labels.customresource_name }} has been in a failed state for longer than 10 minutes." | quote }}
             summary: Resource has failed.
           expr: |-
-            min(gotk_reconcile_condition_gauge{type="Ready"}) by (customresource_kind, exported_namespace, name) == 0
+            min(gotk_reconcile_condition_gauge{type="Ready"}) by (customresource_kind, customresource_namespace, customresource_name) == 0
           for: 10m
           labels:
             severity: critical
             period: WorkingHours
         - alert: ResourcesSuspended
           annotations:
-            description: {{ "Resource {{ $labels.customresource_kind }}/{{ $labels.exported_namespace }}/{{ $labels.name }} has been suspended for longer than 1 hour." | quote }}
+            description: {{ "Resource {{ $labels.customresource_kind }}/{{ $labels.customresource_namespace }}/{{ $labels.customresource_name }} has been suspended for longer than 1 hour." | quote }}
             summary: Resource is suspended.
           expr: |-
-            max(gotk_reconcile_suspended_gauge) by (customresource_kind, exported_namespace, name) == 1
+            max(gotk_reconcile_suspended_gauge) by (customresource_kind, customresource_namespace, customresource_name) == 1
           for: 1h
           labels:
             severity: critical
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
index 851ad217e0..70539ba7a7 100644
--- a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
+++ b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_kube-state-metrics-config.yaml
@@ -75,8 +75,8 @@ customResourceState:
                     )
                   )
                   "labelsFromPath" (dict
-                    "exported_namespace" (list "metadata" "namespace")
-                    "name" (list "metadata" "name")
+                    "customresource_namespace" (list "metadata" "namespace")
+                    "customresource_name" (list "metadata" "name")
                   )
                 )
                 (dict
@@ -90,8 +90,8 @@ customResourceState:
                     )
                   )
                   "labelsFromPath" (dict
-                    "exported_namespace" (list "metadata" "namespace")
-                    "name" (list "metadata" "name")
+                    "customresource_namespace" (list "metadata" "namespace")
+                    "customresource_name" (list "metadata" "name")
                   )
                 )
               )