diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 114527b..99b858e 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -23,6 +23,7 @@
     ./programs/tmux
     ./programs/work-desktop
     ./programs/yt-dlp
+    ./services/attic-client
     ./services/desktop-base
     ./services/dunst
     ./services/espanso
diff --git a/modules/services/attic-client/default.nix b/home-manager/modules/services/attic-client/default.nix
similarity index 58%
rename from modules/services/attic-client/default.nix
rename to home-manager/modules/services/attic-client/default.nix
index d0bd317..c884d50 100644
--- a/modules/services/attic-client/default.nix
+++ b/home-manager/modules/services/attic-client/default.nix
@@ -20,19 +20,19 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ inputs.attic.packages.${system}.attic-client ];
-    # sytemd service
-    systemd.services.az-attic-client = {
-      description = "Watch the nix store and upload new paths to attic";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
+    home.packages = [ inputs.attic.packages.${system}.attic-client ];
+    systemd.user.services.az-attic-client = {
+      Unit = {
+        Description = "Watch the nix store and upload new paths to attic";
+        After = [ "network.target" ];
+      };
+      Install = {
+        WantedBy = [ "multi-user.target" ];
+      };
+      Service = {
         Type = "simple";
         ExecStart = "${atticWatcher}";
         Restart = "always";
-        RestartSec = "5";
-        User = config.az-username;
-        Group = "users";
       };
     };
   };
diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix
index bf5da4c..da03d4f 100644
--- a/home-manager/profiles/desktop.nix
+++ b/home-manager/profiles/desktop.nix
@@ -33,6 +33,7 @@ in
   };
 
   services = {
+    az-attic-client.enable = true;
     az-desktop-base.enable = true;
   };
 }
diff --git a/home-manager/profiles/work-wsl.nix b/home-manager/profiles/work-wsl.nix
index 107da50..e8e1297 100644
--- a/home-manager/profiles/work-wsl.nix
+++ b/home-manager/profiles/work-wsl.nix
@@ -84,5 +84,8 @@
       };
     };
   };
-  services.ssh-agent.enable = true;
+  services = {
+    az-attic-client.enable = true;
+    ssh-agent.enable = true;
+  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 5278cea..609892f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -21,7 +21,6 @@
     ./programs/restic-management
     ./programs/scripts
     ./programs/steam
-    ./services/attic-client
     ./services/attic-server
     ./services/common-x86
     ./services/data-share
diff --git a/systems/gwyn/default.nix b/systems/gwyn/default.nix
index d8223ae..8da9ccb 100644
--- a/systems/gwyn/default.nix
+++ b/systems/gwyn/default.nix
@@ -81,7 +81,6 @@
   };
 
   services = {
-    az-attic-client.enable = true;
     az-logs-share.enable = true;
     az-restic-client-desktop.enable = true;
     az-tlp.enable = true;