diff --git a/grafana/graf-deployment.yaml b/grafana/graf-deployment.yaml
index c14fde8..4292933 100644
--- a/grafana/graf-deployment.yaml
+++ b/grafana/graf-deployment.yaml
@@ -1,10 +1,12 @@
 apiVersion: apps/v1
-kind: DaemonSet
+kind: Deployment
 metadata:
   labels:
     run: blackbox-exporter
   name: blackbox-exporter
+  namespace: monitoring
 spec:
+  replicas: 1
   selector:
     matchLabels:
       run: blackbox-exporter
@@ -28,12 +30,14 @@ spec:
 
 ---
 apiVersion: apps/v1
-kind: DaemonSet
+kind: Deployment
 metadata:
   labels:
     run: grafana
   name: grafana
+  namespace: monitoring
 spec:
+  replicas: 1
   selector:
     matchLabels:
       run: grafana
@@ -82,12 +86,14 @@ spec:
 
 ---
 apiVersion: apps/v1
-kind: DaemonSet
+kind: Deployment
 metadata:
   labels:
     run: prometheus
   name: prometheus
+  namespace: monitoring
 spec:
+  replicas: 1
   selector:
     matchLabels:
       run: prometheus
@@ -108,10 +114,16 @@ spec:
             - mountPath: /etc/prometheus
               readOnly: true
               name: prometheus
+            - mountPath: /prometheus/data
+              readOnly: false
+              name: prometheus-data
       restartPolicy: Always
       volumes:
         - name: prometheus
           persistentVolumeClaim:
             claimName: prometheus
+        - name: prometheus-data
+          persistentVolumeClaim:
+            claimName: prometheus-data
 
 
diff --git a/grafana/graf-ingress.yaml b/grafana/graf-ingress.yaml
index ffcfc82..ce9d96f 100644
--- a/grafana/graf-ingress.yaml
+++ b/grafana/graf-ingress.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: grafana-ingr
+  namespace: monitoring
 spec:
   ingressClassName: nginx
   rules:
diff --git a/grafana/graf-services.yaml b/grafana/graf-services.yaml
index 03bafaa..5054652 100644
--- a/grafana/graf-services.yaml
+++ b/grafana/graf-services.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     run: grafana
   name: grafana
+  namespace: monitoring
 spec:
   ports:
     - name: "grafweb"
@@ -19,6 +20,7 @@ metadata:
   labels:
     run: prometheus
   name: prometheus
+  namespace: monitoring
 spec:
   ports:
     - name: "prom"
@@ -26,6 +28,7 @@ spec:
       targetPort: 9090
   selector:
     run: prometheus
+  type: LoadBalancer
 
 ---
 apiVersion: v1
@@ -34,6 +37,7 @@ metadata:
   labels:
     run: blackbox-exporter
   name: blackbox-exporter
+  namespace: monitoring
 spec:
   ports:
     - name: "bbox"
diff --git a/grafana/grafana-pvc.yaml b/grafana/grafana-pvc.yaml
index 2061f27..957d199 100644
--- a/grafana/grafana-pvc.yaml
+++ b/grafana/grafana-pvc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: blackbox-exporter
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteMany
@@ -17,6 +18,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: grafana-data
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteMany
@@ -31,6 +33,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: grafana-conf
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteMany
@@ -45,6 +48,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: prometheus
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteMany
@@ -54,3 +58,18 @@ spec:
       storage: 10Gi
   volumeName: prometheus
 
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: prometheus-data
+  namespace: monitoring
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: ""
+  resources:
+    requests:
+      storage: 10Gi
+  volumeName: prometheus-data
+
diff --git a/grafana/grafana-volumeclaims.yaml b/grafana/grafana-volumeclaims.yaml
index 5205f8e..cb7a5dd 100644
--- a/grafana/grafana-volumeclaims.yaml
+++ b/grafana/grafana-volumeclaims.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: blackbox-exporter
+  namespace: monitoring
 spec:
   capacity:
     storage: 10Gi
@@ -19,6 +20,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: grafana-data
+  namespace: monitoring
 spec:
   capacity:
     storage: 50Gi
@@ -35,6 +37,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: grafana-conf
+  namespace: monitoring
 spec:
   capacity:
     storage: 10Gi
@@ -51,6 +54,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: prometheus
+  namespace: monitoring
 spec:
   capacity:
     storage: 10Gi
@@ -62,3 +66,20 @@ spec:
   mountOptions:
     - nfsvers=4.2
 
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: prometheus-data
+  namespace: monitoring
+spec:
+  capacity:
+    storage: 30Gi
+  accessModes:
+    - ReadWriteMany
+  nfs:
+    server: nas.sq.lan
+    path: "/swarmdata/grafana/prometheus-data"
+  mountOptions:
+    - nfsvers=4.2
+
diff --git a/grafana/monitoring-ns.yaml b/grafana/monitoring-ns.yaml
new file mode 100644
index 0000000..d325236
--- /dev/null
+++ b/grafana/monitoring-ns.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring