diff --git a/cluster/manifests/freeleaps-controls-system/namespace copy.yaml b/cluster/manifests/freeleaps-controls-system/namespace copy.yaml
new file mode 100644
index 00000000..893b761a
--- /dev/null
+++ b/cluster/manifests/freeleaps-controls-system/namespace copy.yaml	
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: freeleaps-controls-system
+  labels:
+    name: freeleaps-controls-system
\ No newline at end of file
diff --git a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
index d6558627..e7fd26ef 100644
--- a/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
+++ b/cluster/manifests/freeleaps-monitoring-system/kube-prometheus-stack/values.yaml
@@ -1003,7 +1003,7 @@ alertmanager:
 ##
 grafana:
   enabled: true
-  namespaceOverride: ""
+  namespaceOverride: "freeleaps-monitoring-system"
 
   ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
   ##
@@ -2132,7 +2132,7 @@ kubeStateMetrics:
 ## Configuration for kube-state-metrics subchart
 ##
 kube-state-metrics:
-  namespaceOverride: ""
+  namespaceOverride: "freeleaps-monitoring-system"
   rbac:
     create: true
   releaseLabel: true
@@ -2217,7 +2217,7 @@ nodeExporter:
 ## Configuration for prometheus-node-exporter subchart
 ##
 prometheus-node-exporter:
-  namespaceOverride: ""
+  namespaceOverride: "freeleaps-monitoring-system"
   podLabels:
     ## Add the 'node-exporter' label to be used by serviceMonitor to match standard common usage in rules and grafana dashboards
     ##
@@ -3972,7 +3972,14 @@ prometheus:
     ## Prometheus StorageSpec for persistent data
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/storage.md
     ##
-    storageSpec: {}
+    storageSpec:
+      volumeClaimTemplate:
+        spec:
+          storageClassName: freeleaps-node-local
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 20Gi
     ## Using PersistentVolumeClaim
     ##
     #  volumeClaimTemplate:
@@ -4500,7 +4507,7 @@ thanosRuler:
 
   ## Deploy thanosRuler
   ##
-  enabled: false
+  enabled: true
 
   ## Annotations for ThanosRuler
   ##