diff --git a/k8s/monitoring/alertmanagerconfig.secret.yaml b/k8s/monitoring/alertmanagerconfig.secret.yaml
index 5b2daee..f8bb74f 100644
Binary files a/k8s/monitoring/alertmanagerconfig.secret.yaml and b/k8s/monitoring/alertmanagerconfig.secret.yaml differ
diff --git a/k8s/monitoring/prometheus-operator.secret.yml b/k8s/monitoring/prometheus-operator.secret.yml
index 6fa58c1..9c6187e 100644
--- a/k8s/monitoring/prometheus-operator.secret.yml
+++ b/k8s/monitoring/prometheus-operator.secret.yml
@@ -12,6 +12,8 @@ prometheus:
         password: aeThoom4deiNgeici0Th
       static_configs:
       - targets: [ 'dyndns-muc.moritzgraf.de:60200']
+        labels:
+          namespace: monitoring
     - job_name: muc-living
       scrape_interval: 1m
       basic_auth:
@@ -19,6 +21,8 @@ prometheus:
         password: eeLie9Mai9ahfi5ahy2i
       static_configs:
       - targets: [ 'dyndns-muc.moritzgraf.de:60201']
+        labels:
+          namespace: monitoring
     - job_name: rgbg-living
       scrape_interval: 1m
       basic_auth:
@@ -26,6 +30,18 @@ prometheus:
         password: oonohNaej6soh7TooPha
       static_configs:
       - targets: [ 'dyndns.moritzgraf.de:60200']
+        labels:
+          namespace: monitoring
+    storageSpec:
+      ## Using PersistentVolumeClaim
+      ##
+      volumeClaimTemplate:
+        spec:
+          storageClassName: openebs-hostpath
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 50Gi
   ingress: 
     enabled: true
     hosts: 
@@ -45,17 +61,7 @@ prometheus:
   # prometheusSpec:
   #   scrapeInterval: "300s"
   logLevel: debug
-  storageSpec:
-    ## Using PersistentVolumeClaim
-    ##
-    volumeClaimTemplate:
-      spec:
-        storageClassName: openebs-hostpath
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 50Gi
-      selector: {}
+
   extraSecret:
     name: "prometheus-auth"
     annotations: {}
@@ -88,8 +94,16 @@ alertmanager:
           operator: In
           values:
             - haumdaucher
-  # alertmanagerConfiguration:
-  #   name: haumdaucher-alertmanager
+    storage:
+      ## Using PersistentVolumeClaim
+      ##
+      volumeClaimTemplate:
+        spec:
+          storageClassName: openebs-hostpath
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: 1Gi
 grafana:
   persistence:
     enabled: true
diff --git a/k8s/monitoring/telegram.secret.yaml b/k8s/monitoring/telegram.secret.yaml
deleted file mode 100644
index 30fc7f3..0000000
Binary files a/k8s/monitoring/telegram.secret.yaml and /dev/null differ