diff --git a/flake.lock b/flake.lock
index f2e2f0a..8a95722 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,6 +164,26 @@
       }
     },
     "devshell_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "devshell_3": {
       "inputs": {
         "nixpkgs": [
           "nix-topology",
@@ -859,7 +879,7 @@
     },
     "nix-topology": {
       "inputs": {
-        "devshell": "devshell_2",
+        "devshell": "devshell_3",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
@@ -1112,6 +1132,7 @@
         "agenix": "agenix",
         "agenix-rekey": "agenix-rekey",
         "deploy-rs": "deploy-rs",
+        "devshell": "devshell_2",
         "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-parts": "flake-parts_2",
diff --git a/flake.nix b/flake.nix
index 3a959bc..c952aa3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,11 @@
 
     deploy-rs.url = "github:serokell/deploy-rs";
 
+    devshell = {
+      url = "github:numtide/devshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -103,6 +108,7 @@
         inputs.agenix-rekey.flakeModule
         inputs.pre-commit-hooks.flakeModule
         inputs.nix-topology.flakeModule
+        ./nix/devshell.nix
         ./nix/hosts.nix
       ];
 
diff --git a/nix/devshell.nix b/nix/devshell.nix
new file mode 100644
index 0000000..c0b46c0
--- /dev/null
+++ b/nix/devshell.nix
@@ -0,0 +1,20 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.devshell.flakeModule
+  ];
+
+  perSystem =
+    { pkgs, ... }:
+    {
+      devshells.default = {
+        commands = [
+          {
+            package = pkgs.deploy-rs;
+            name = "deploy";
+            help = "Deploy this nix-config to remote hosts";
+          }
+        ];
+      };
+    };
+}