diff --git a/clanServices/monitoring/telegraf.nix b/clanServices/monitoring/telegraf.nix
index cebdb4365..93abe67b2 100644
--- a/clanServices/monitoring/telegraf.nix
+++ b/clanServices/monitoring/telegraf.nix
@@ -11,7 +11,6 @@
           ...
         }:
         let
-          jsonpath = "/tmp/telegraf.json";
           auth_user = "prometheus";
         in
         {
@@ -59,9 +58,22 @@
             after = [ "telegraf.service" ];
             wants = [ "telegraf.service" ];
             serviceConfig = {
+              LoadCredential = [
+                "auth_file_path:${config.clan.core.vars.generators.telegraf.files.miniserve-auth.path}"
+              ];
+              Environment = [
+                "AUTH_FILE_PATH=%d/auth_file_path"
+              ];
               Restart = "on-failure";
+              User = "telegraf";
+              Group = "telegraf";
             };
-            script = "${pkgs.miniserve}/bin/miniserve -p 9990 ${jsonpath} --auth-file ${config.clan.core.vars.generators.telegraf.files.miniserve-auth.path}";
+            script = "${pkgs.miniserve}/bin/miniserve -p 9990 /var/lib/telegraf/telegraf.json --auth-file \"$AUTH_FILE_PATH\"";
+          };
+
+          users.users.telegraf = {
+            home = "/var/lib/telegraf";
+            createHome = true;
           };
 
           services.telegraf = {
@@ -107,7 +119,7 @@
               };
 
               outputs.file = {
-                files = [ jsonpath ];
+                files = [ "/var/lib/telegraf/telegraf.json" ];
                 data_format = "json";
                 json_timestamp_units = "1s";
               };
diff --git a/clanServices/monitoring/tests/vm/default.nix b/clanServices/monitoring/tests/vm/default.nix
index 8c0a4226c..7afdd53db 100644
--- a/clanServices/monitoring/tests/vm/default.nix
+++ b/clanServices/monitoring/tests/vm/default.nix
@@ -54,6 +54,7 @@
 
       peer1.wait_for_unit("network-online.target")
       peer1.wait_for_unit("telegraf.service")
+
       peer1.wait_for_unit("telegraf-json.service")
       peer1.succeed("curl http://localhost:9990")
       peer1.succeed("curl http://localhost:9273/metrics")