diff --git a/infra/monitoring/auth-secret.yaml b/infra/monitoring/auth/auth-secret.yaml
similarity index 100%
rename from infra/monitoring/auth-secret.yaml
rename to infra/monitoring/auth/auth-secret.yaml
diff --git a/infra/monitoring/auth-values.yaml b/infra/monitoring/auth/auth-values.yaml
similarity index 100%
rename from infra/monitoring/auth-values.yaml
rename to infra/monitoring/auth/auth-values.yaml
diff --git a/infra/monitoring/auth/kustomization.yaml b/infra/monitoring/auth/kustomization.yaml
new file mode 100644
index 0000000..9719f23
--- /dev/null
+++ b/infra/monitoring/auth/kustomization.yaml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - auth-secret.yaml
+
+helmGlobals:
+  chartHome: ../../../charts
+
+helmCharts:
+  - name: application
+    releaseName: auth
+    valuesFile: auth-values.yaml
diff --git a/infra/monitoring/kustomization.yaml b/infra/monitoring/kustomization.yaml
index 5d5c58d..80255d8 100644
--- a/infra/monitoring/kustomization.yaml
+++ b/infra/monitoring/kustomization.yaml
@@ -2,15 +2,22 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
-  - auth-secret.yaml
-  - kube-prometheus-stack.yaml
+  - ns.yaml
   - ingress-route.yaml
-
-helmGlobals:
-  chartHome: ../../charts
+  - auth
 
 helmCharts:
-  - name: application
-    releaseName: auth
-    valuesFile: auth-values.yaml
+  - name: kube-prometheus-stack
+    repo: https://prometheus-community.github.io/helm-charts
+    version: 44.3.0
+    releaseName: kube-prometheus-stack
+    namespace: monitoring
+    valuesInline:
+      prometheus-node-exporter:
+        hostRootFsMount:
+          enabled: false
+      prometheusOperator:
+        admissionWebhooks:
+          failurePolicy: Ignore
+
+
diff --git a/infra/monitoring/namespace.yaml b/infra/monitoring/ns.yaml
similarity index 100%
rename from infra/monitoring/namespace.yaml
rename to infra/monitoring/ns.yaml