diff --git a/flake-parts/dev-shell.nix b/flake-parts/dev-shell.nix
index 5318e8c..a138228 100644
--- a/flake-parts/dev-shell.nix
+++ b/flake-parts/dev-shell.nix
@@ -1,11 +1,12 @@
 _: {
   perSystem =
-    { pkgs, ... }:
+    { inputs', pkgs, ... }:
     {
       devShells.default = pkgs.mkShellNoCC {
         packages = [
           pkgs.just
           pkgs.nh
+          inputs'.deploy-rs.packages.default
         ];
       };
     };
diff --git a/flake-parts/hosts.nix b/flake-parts/hosts.nix
index 399a6e5..e104cea 100644
--- a/flake-parts/hosts.nix
+++ b/flake-parts/hosts.nix
@@ -17,8 +17,26 @@ let
       ]
       ++ lib.optional (lib.pathExists "${self}/users/seb/@${hostName}") "${self}/users/seb/@${hostName}";
     };
+
+  mkDeployNode = hostName: {
+    hostname = "${hostName}.${
+      self.nixosConfigurations.${hostName}.config.custom.networking.overlay.domain
+    }";
+    user = "root";
+    interactiveSudo = true;
+    profiles.system.path =
+      inputs.deploy-rs.lib.x86_64-linux.activate.nixos
+        self.nixosConfigurations.${hostName};
+  };
+
+  hostNames = "${self}/hosts" |> self.lib.listDirectoryNames;
 in
 {
-  flake.nixosConfigurations =
-    "${self}/hosts" |> self.lib.listDirectoryNames |> self.lib.genAttrs mkHost;
+  flake = {
+    nixosConfigurations = hostNames |> self.lib.genAttrs mkHost;
+
+    deploy.nodes = hostNames |> self.lib.genAttrs mkDeployNode;
+
+    checks = inputs.deploy-rs.lib |> lib.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy);
+  };
 }
diff --git a/flake-parts/modules.nix b/flake-parts/modules.nix
index e2fa360..4e3e408 100644
--- a/flake-parts/modules.nix
+++ b/flake-parts/modules.nix
@@ -2,6 +2,6 @@
 {
   flake = {
     nixosModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/system";
-    homeModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/home";
+    homeManagerModules.default.imports = self.lib.listNixFilesRecursively "${self}/modules/home";
   };
 }
diff --git a/flake.lock b/flake.lock
index 4aa9abf..3c23363 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,6 +58,28 @@
         "url": "https://codeberg.org/kampka/nix-flake-crowdsec.git"
       }
     },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1766051518,
+        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -117,6 +139,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -313,6 +351,7 @@
         "betterfox": "betterfox",
         "comin": "comin",
         "crowdsec": "crowdsec",
+        "deploy-rs": "deploy-rs",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "flake-parts": "flake-parts",
@@ -362,6 +401,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt": {
       "inputs": {
         "nixpkgs": [
@@ -382,6 +436,24 @@
         "type": "github"
       }
     },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "vscode-extensions": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 67951df..a2f5d4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     treefmt = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/justfile b/justfile
index 74dca9a..04f6c4e 100644
--- a/justfile
+++ b/justfile
@@ -40,9 +40,7 @@ reboot:
 
 [group('remote')]
 deploy +hosts:
-    for host in {{ hosts }}; do \
-      nh os switch . --hostname=$host --target-host=$host; \
-    done
+    deploy --skip-checks --targets $(echo {{ hosts }} | sed 's/[^ ]*/\.#&/g')
 
 [group('remote')]
 install host destination='root@installer':
diff --git a/modules/home/sops.nix b/modules/home/sops.nix
index 665087f..f32118a 100644
--- a/modules/home/sops.nix
+++ b/modules/home/sops.nix
@@ -9,7 +9,7 @@ let
   cfg = config.custom.sops;
 in
 {
-  imports = [ inputs.sops.homeModules.sops ];
+  imports = [ inputs.sops.homeManagerModules.sops ];
 
   options.custom.sops = {
     enable = lib.mkEnableOption "";
diff --git a/users/seb/home.nix b/users/seb/home.nix
index 41f558e..a00a67c 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  imports = [ self.homeModules.default ];
+  imports = [ self.homeManagerModules.default ];
 
   xdg = {
     enable = true;