diff --git a/home/default.nix b/home/default.nix
index 7ef13ca..617b007 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -21,6 +21,7 @@
           # ./nushell.nix
           ./just.nix
           # ./powershell.nix
+          ./juspay.nix
         ];
       };
       common-linux = {
diff --git a/home/juspay.nix b/home/juspay.nix
new file mode 100644
index 0000000..8023079
--- /dev/null
+++ b/home/juspay.nix
@@ -0,0 +1,27 @@
+# For Juspay work
+{ pkgs, lib, ... }:
+{
+  programs.ssh = {
+    matchBlocks = {
+      # Juspay machines (through Tailscale)
+      vanjaram = {
+        hostname = "100.83.79.127";
+        user = "srid";
+        forwardAgent = true;
+      };
+      biryani = {
+        hostname = "100.97.32.60";
+        user = "admin";
+        forwardAgent = true;
+      };
+
+      # To clone Juspay repos.
+      # https://developer.1password.com/docs/ssh/agent/advanced/#match-key-with-host
+      "bitbucket.org" = {
+        identitiesOnly = true;
+        identityFile = "~/.ssh/juspay.pub";
+      };
+    };
+  };
+}
+
diff --git a/home/ssh.nix b/home/ssh.nix
index d774ee9..b332248 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -2,27 +2,13 @@
 {
   programs.ssh = {
     enable = true;
+
+    # Note: More defined in juspay.nix
     matchBlocks = {
-      vanjaram = {
-        hostname = "100.83.79.127";
-        user = "srid";
-        forwardAgent = true;
-      };
-      biryani = {
-        hostname = "100.97.32.60";
-        user = "admin";
-        forwardAgent = true;
-      };
       immediacy = {
         hostname = "65.109.84.215";
         forwardAgent = true;
       };
-      # To clone Juspay repos.
-      # https://developer.1password.com/docs/ssh/agent/advanced/#match-key-with-host
-      "bitbucket.org" = {
-        identitiesOnly = true;
-        identityFile = "~/.ssh/juspay.pub";
-      };
     };
   };
 }