diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
index ddfd7ed6f427115658bdbc5b67aa62c9ae474ad6..dca11f7243f957317fa3720c2e1415ea6d69f3f5 100644
--- a/infrastructure/kustomization.yaml
+++ b/infrastructure/kustomization.yaml
@@ -10,4 +10,4 @@ resources:
   - cert-manager
   - nginx-system
   - longhorn
-  - prometheus
+  - monitoring
diff --git a/infrastructure/prometheus/kustomization.yaml b/infrastructure/monitoring/kustomization.yaml
similarity index 81%
rename from infrastructure/prometheus/kustomization.yaml
rename to infrastructure/monitoring/kustomization.yaml
index 920eff1481d172f6d6425aa6db97ae0ed5f1b469..8fcc611e7f9e8d15310390f6975c9fab09e1e248 100644
--- a/infrastructure/prometheus/kustomization.yaml
+++ b/infrastructure/monitoring/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
+namespace: monitoring-system
 resources:
   - namespace.yaml
   - repository.yaml
diff --git a/infrastructure/prometheus/namespace.yaml b/infrastructure/monitoring/namespace.yaml
similarity index 64%
rename from infrastructure/prometheus/namespace.yaml
rename to infrastructure/monitoring/namespace.yaml
index 14d23d81737f047784cd0e27302690787cb951cd..da40b2df00a450e410f8594cc9d71a2930c38212 100644
--- a/infrastructure/prometheus/namespace.yaml
+++ b/infrastructure/monitoring/namespace.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: monitoring
+  name: monitoring-system
   labels:
-    name: monitoring
+    name: monitoring-system
     kyverno.shivering-isles.com/class: "system"
diff --git a/infrastructure/prometheus/release.yaml b/infrastructure/monitoring/release.yaml
similarity index 99%
rename from infrastructure/prometheus/release.yaml
rename to infrastructure/monitoring/release.yaml
index bd1e87cfc5b9effbb8fa34c1359784346e1cefcf..7c705b594c2567142d1b5513356fdc4fa56b35c0 100644
--- a/infrastructure/prometheus/release.yaml
+++ b/infrastructure/monitoring/release.yaml
@@ -2,15 +2,16 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: kube-prometheus
-  namespace: monitoring
+  namespace: monitoring-system
 spec:
-  releaseName: monitoring
+  releaseName: kube-prometheus-stack
   chart:
     spec:
       chart: kube-prometheus-stack
       sourceRef:
         kind: HelmRepository
         name: prometheus-community
+        namespace: monitoring-system
       # renovate: helmRepo=https://prometheus-community.github.io/helm-charts depName=kube-prometheus-stack
       version: 30.0.1
   interval: 5m
diff --git a/infrastructure/prometheus/repository.yaml b/infrastructure/monitoring/repository.yaml
similarity index 85%
rename from infrastructure/prometheus/repository.yaml
rename to infrastructure/monitoring/repository.yaml
index 64a1a415e48750aa07a2aae0fdc3cc03004b620a..94277421c021fc0435bca8fd0004a8f4a3c99ed7 100644
--- a/infrastructure/prometheus/repository.yaml
+++ b/infrastructure/monitoring/repository.yaml
@@ -2,6 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: prometheus-community
+  namespace: monitoring-system
 spec:
   interval: 30m
   url: https://prometheus-community.github.io/helm-charts