diff --git a/secrets/passwords.yaml b/secrets/passwords.yaml
index e670e9d..3f192a7 100644
--- a/secrets/passwords.yaml
+++ b/secrets/passwords.yaml
@@ -14,8 +14,8 @@ services:
         nginx: ENC[AES256_GCM,data:1vQE9z+w6RGwFK8mOuhzW3NArwthEcY/c/yQzAA6IwXtsDuxu7AS11M=,iv:jMtkHRR/+DVX1FREGUVTSTVUUUzOpjrLbNabHnw8Dq0=,tag:HbtQyuLlW5AbYqYDrtrbJA==,type:str]
     vyos:
         vyos: ENC[AES256_GCM,data:IUeOs7fPj008Iz31QLC7iCxG5wQ=,iv:FlZcvasmJBR3l6Pk1DELgF0f/lBfrxxoS6jeRsGunmQ=,tag:CMZr2AvzxDO3Vo1FKzoQtw==,type:str]
-    telegrambot:
-        token: ENC[AES256_GCM,data:z4petJLrEzU2Wtc86t6M+DTa9wcc3nI8thPU3l8aTA9HKC7VLSgH2B3D6McN4uA=,iv:7drqfGluodIxbpl6wJ6S+aD0g7Oy79/C+D4jgwW/iLM=,tag:WIPg3Gbs4VQB7sQUEdJJ+g==,type:str]
+    telegram_bot:
+        token: ENC[AES256_GCM,data:fdjeYTIES8Ur6LXI5Ix+QVa4q488QdUNaVjGytGUFf9uuGfe6hqHChYM0UKZhA==,iv:/LDYrngYw/bBWata7qrxaGDKhM3yAOrP32FaAOGAeWg=,tag:12htPWas6JvBfFEjbYCG7g==,type:str]
     juniperswitches:
         root: ENC[AES256_GCM,data:EpYwKI9TJ+6TUlIwSbIDhmOAgJD38+RI,iv:bJq0Bnr7SdvGRXR141+rKpZxi1jWO+efUcZDLFkdMcY=,tag:WgN15gUMdawEj92TZOss7g==,type:str]
 hardware:
@@ -100,7 +100,7 @@ sops:
             V2IwTDgvaTVwU1JSYnppQzIrb3RsT3MKrYBsN/2DHCT49ilW8KGjqVmNXcjqtWVl
             TGsxv+tZdzR/f4y55j9XKObjxBTALiLGoa/Wy2eqHM6i7k6jvXI5eA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-17T10:43:07Z"
-    mac: ENC[AES256_GCM,data:n2IGcbD4huMjxPk+A5rQZrGGRZwuLxkDu4H/lIj2r/IWi4B77ivzTdL4hafQ+yk3UNg2m5IVrVwqZAIDXDCY6mDAMUmpHsTDPo2ApME0x1IBkEKvrUH6uKFIPRjHIwP+5oPCREhQNhCokPHdbV37ZSC49Q+jof3gTxdq7Phr4zQ=,iv:b35D4VnzlBwig+yrWYSIaghy0vLPs1ll75wwZhehWKw=,tag:nQj8d4kr8k6pysu3KASmqg==,type:str]
+    lastmodified: "2025-04-18T22:14:33Z"
+    mac: ENC[AES256_GCM,data:lK59/ig4lIovjErFkyKu8x4TemuQ/sXfO8Ybo0n1eLbfJAolraEzlHoALmhcUB7PRG5ll2uiBjhIutWsPPe5hjCezzVDHEM4aN/qkJqINvNOEj/vdbHm8s6jsMwc7XC5X7tr8kVicrfZJBnLC2YvNXQ0nKZD1qT7QW18GZEGEhQ=,iv:c8y9UPOJsrkuQVr+qWH/SnSNKcBrb7LZ4sA/1vxCbGo=,tag:LGo89zXkZ+z5WtJlAsVuTg==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.1
diff --git a/systems/monitoring.noc.eh22.intern/alloy-conf.nix b/systems/monitoring.noc.eh22.intern/alloy-conf.nix
index 9079c50..5dc1400 100644
--- a/systems/monitoring.noc.eh22.intern/alloy-conf.nix
+++ b/systems/monitoring.noc.eh22.intern/alloy-conf.nix
@@ -31,6 +31,10 @@
           target_label = "component" 
           replacement = "telegraf-prometheus-client"
         }
+        rule {
+          target_label = "job" 
+          replacement = "telegraf-prometheus-client"
+        }
       }
     '';
   };
diff --git a/systems/monitoring.noc.eh22.intern/mimir.nix b/systems/monitoring.noc.eh22.intern/mimir.nix
index 1936ae2..8dd7c08 100644
--- a/systems/monitoring.noc.eh22.intern/mimir.nix
+++ b/systems/monitoring.noc.eh22.intern/mimir.nix
@@ -70,14 +70,14 @@ in
             receiver = "telegram";
             group_wait = "45s";
             group_interval = "3m";
-            repeat_interval = "45m";
+            repeat_interval = "30m";
           };
           receivers = [
             {
               name = "telegram";
               telegram_configs = [
                 {
-                  bot_token_file = config.sops.secrets."services/telegrambot/token".path;
+                  bot_token_file = config.sops.secrets."services/telegram_bot/token".path;
                   chat_id = -1002579132187;
                 }
               ];
diff --git a/systems/monitoring.noc.eh22.intern/system.nix b/systems/monitoring.noc.eh22.intern/system.nix
index 5af61e4..a9fb869 100644
--- a/systems/monitoring.noc.eh22.intern/system.nix
+++ b/systems/monitoring.noc.eh22.intern/system.nix
@@ -32,7 +32,7 @@
       group = "nginx";
       restartUnits = [ "nginx.service" ];
     };
-    secrets."services/telegrambot/token" = {
+    secrets."services/telegram_bot/token" = {
       mode = "0444";
       owner = "root";
       group = "root";