diff --git a/postgres-values.yaml b/postgres-values.yaml
index 0aa1eea..4d8e135 100644
--- a/postgres-values.yaml
+++ b/postgres-values.yaml
@@ -11,8 +11,8 @@ persistence:
 volumePermissions:
   enabled: true
 securityContext:
-  fsGroup: 1000
-  runAsUser: 1000
+  fsGroup: 0
+  runAsUser: 0
 service:
   type: NodePort
   nodePort: 32222
diff --git a/prometheus-values.yaml b/prometheus-values.yaml
index 23d188d..25cef46 100644
--- a/prometheus-values.yaml
+++ b/prometheus-values.yaml
@@ -5,7 +5,6 @@ prometheusOperator:
     ip: 192.168.1.2
   securityContext:
     runAsGroup: 1000
-    runAsNonRoot: true
     fsGroup: 1000
     runAsUser: 1000
 #   resources:
@@ -16,6 +15,9 @@ prometheusOperator:
 #       cpu: 1300m
 #       memory: 1500Mi
 prometheus:
+  serviceMonitorNamespaceSelector:
+    matchLabels:
+      release: prometheus
   prometheusSpec:
     nodeSelector:
       ip: 192.168.1.2
@@ -28,8 +30,10 @@ prometheus:
       volumeClaimTemplate:
         spec:
           storageClassName: manual
-          # existingClaim: prometheus-pvc
           accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 50Gi
     resources:
       requests:
         cpu: 800m
@@ -39,13 +43,14 @@ prometheus:
         memory: 3000Mi
     securityContext:
       runAsGroup: 1000
-      runAsNonRoot: true
       fsGroup: 1000
       runAsUser: 1000
     probeSelector:
-      release: prometheus
+      matchLabels:
+        release: prometheus
     probeNamespaceSelector:
-      any: true
+      matchLabels:
+        release: prometheus
 grafana:
   image:
     tag: 7.0.1