diff --git a/home/logistik/home.nix b/home/logistik/home.nix
index 195f533..90c6d62 100644
--- a/home/logistik/home.nix
+++ b/home/logistik/home.nix
@@ -229,9 +229,13 @@
   programs.home-manager.enable = true;
 
   # Systemd Timer für nächtliches home-manager update
-  systemd.user.services.home-manager-update = {
+  # Der hostname wird zur Build-Zeit in das Script eingebettet
+  systemd.user.services.home-manager-update = let
+    flakeConfig = "logistik@${hostname}";
+    repoUrl = "git+https://git.az-gruppe.com/AZ-Intec-GmbH/AZ-NIX.git";
+  in {
     Unit = {
-      Description = "Update home-manager configuration from git";
+      Description = "Update home-manager configuration for ${hostname}";
       After = "network-online.target";
     };
     Service = {
@@ -239,21 +243,21 @@
       ExecStart = "${pkgs.writeShellScript "home-manager-update" ''
         set -e
 
-        echo "[$(date)] Starting home-manager update..."
+        echo "[$(${pkgs.coreutils}/bin/date)] Starting home-manager update for ${flakeConfig}..."
 
         # Prüfe ob lokales Repo existiert
         if [ -d "/home/${config.home.username}/AZ-NIX" ]; then
           echo "Using local repository..."
           cd /home/${config.home.username}/AZ-NIX
           ${pkgs.git}/bin/git pull
-          ${pkgs.nix}/bin/nix run home-manager/release-25.05 -- switch --flake .#logistik@${hostname}
+          ${pkgs.nix}/bin/nix run home-manager/release-25.05 -- switch --flake .#${flakeConfig}
         else
           echo "Using remote repository..."
           ${pkgs.nix}/bin/nix run home-manager/release-25.05 -- switch \
-            --flake git+https://git.az-gruppe.com/AZ-Intec-GmbH/AZ-NIX.git#logistik@${hostname}
+            --flake ${repoUrl}#${flakeConfig}
         fi
 
-        echo "[$(date)] Update completed"
+        echo "[$(${pkgs.coreutils}/bin/date)] Update completed successfully"
       ''}";
     };
   };