diff --git a/homes/x86_64-linux/kb@Ohybke/ssh.nix b/homes/x86_64-linux/kb@Ohybke/ssh.nix
index 8ca45ce..27fbc8b 100644
--- a/homes/x86_64-linux/kb@Ohybke/ssh.nix
+++ b/homes/x86_64-linux/kb@Ohybke/ssh.nix
@@ -3,6 +3,94 @@
   # SSH Configuration
   services.ssh-agent.enable = true;
   programs.ssh.enable = true;
+
+  # SSH Shell Connections
+  programs.ssh.matchBlocks."master@pkpnafs-m1ni" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."master@pkpnafs-ho2o" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@ho2o";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."master@pkpnafs-lar3" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."master@senfnvp-m1ni" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@senfnvp-ho2o" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@ho2o";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@senfnvp-lar3" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@mow0m-m1ni" = {
+    host = "mow0m";
+    hostname = "mow0m";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@mow0m-ho2o" = {
+    host = "mow0m";
+    hostname = "mow0m";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@ho2o";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@mow0m-lar3" = {
+    host = "mow0m";
+    hostname = "mow0m";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3";
+    port = 9553;
+  };
+  programs.ssh.matchBlocks."master@web-m1ni" = {
+    host = "web";
+    hostname = "kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
+    port = 2222;
+  };
+  programs.ssh.matchBlocks."master@web-ho2o" = {
+    host = "web";
+    hostname = "kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@ho2o";
+    port = 2222;
+  };
+  programs.ssh.matchBlocks."master@web-lar3" = {
+    host = "web";
+    hostname = "kb-one.de";
+    user = "master";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3t.";
+    port = 2222;
+  };
+
+  # SSH Git Connections
   programs.ssh.matchBlocks."kb01@kb-one-git" = {
     host = "git.kb-one.de";
     user = "git";
@@ -14,39 +102,27 @@
     user = "git";
     identityFile = "~/.ssh/kb01@0x90-git";
   };
-  programs.ssh.matchBlocks."master@pkpnafs" = {
-    host = "pkpnafs";
-    hostname = "pkpnafs.kb-one.de";
-    user = "master";
-    identityFile = "~/.ssh/master@pkpnafs";
-    port = 3422;
-  };
-  programs.ssh.matchBlocks."master@kb-web-01" = {
-    host = "kb-web-01";
-    hostname = "kb-one.de";
-    user = "master";
-    identityFile = "~/.ssh/master@kb-web-01";
-    port = 2222;
-  };
-  programs.ssh.matchBlocks."remoteunlock-senfnvp" = {
+
+  # SSH Remoteunlock Connections
+  programs.ssh.matchBlocks."remoteunlock@senfnvp-m1ni" = {
     host = "remoteunlock-senfnvp";
     hostname = "senfnvp.kb-one.de";
     user = "root";
-    identityFile = "~/.ssh/remoteunlock-senfnvp";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@m1ni";
     port = 7299;
   };
-  programs.ssh.matchBlocks."master@senfnvp" = {
-    host = "senfnvp";
+  programs.ssh.matchBlocks."remoteunlock@senfnvp-ho2o" = {
+    host = "remoteunlock-senfnvp";
     hostname = "senfnvp.kb-one.de";
-    user = "master";
-    identityFile = "~/.ssh/master@senfnvp";
-    port = 9553;
+    user = "root";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@ho2o";
+    port = 7299;
   };
-  programs.ssh.matchBlocks."master@mow0m" = {
-    host = "mow0m";
-    hostname = "mow0m";
-    user = "master";
-    identityFile = "~/.ssh/master@mow0m";
-    port = 9553;
+  programs.ssh.matchBlocks."remoteunlock@senfnvp-lar3" = {
+    host = "remoteunlock-senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "root";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3";
+    port = 7299;
   };
 }