diff --git a/configuration.nix b/configuration.nix
index 81b73b2..e5b6c26 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -80,7 +80,6 @@
     dnsovertls = "true";
   };
 
-
   services.gvfs.enable = true;
 
   # VPN services
diff --git a/home.nix b/home.nix
index 3209cef..fe80b53 100644
--- a/home.nix
+++ b/home.nix
@@ -120,6 +120,35 @@ in
     sway-contrib.grimshot
   ]);
 
+  # Jumphost for deployment on infra
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+    "infra.cdaut.de" = {
+      hostname = "infra.cdaut.de";
+      user = "clara";
+      forwardAgent = true;
+    };
+    
+    "10.0.0.2" = {
+      hostname = "10.0.0.2";
+      proxyJump = "infra.cdaut.de";
+    };
+    "*" = {
+      forwardAgent = true;
+      addKeysToAgent = "no";
+      compression = false;
+      serverAliveInterval = 0;
+      serverAliveCountMax = 3;
+      hashKnownHosts = false;
+      userKnownHostsFile = "~/.ssh/known_hosts";
+      controlMaster = "no";
+      controlPath = "~/.ssh/master-%r@%n:%p";
+      controlPersist = "no";
+    };
+    };
+  };
 
 
   fonts.fontconfig.enable = true;