diff --git a/profiles/contexts/desktop/default.nix b/profiles/contexts/desktop/default.nix
index 7e1e2f0..55b57b7 100644
--- a/profiles/contexts/desktop/default.nix
+++ b/profiles/contexts/desktop/default.nix
@@ -71,7 +71,7 @@
       (element-desktop.override {
         commandLineArgs = "--password-store=gnome-libsecret";
       })
-      m3taHomeInputs.hermes-agent.packages.${pkgs.system}.desktop
+      m3taHomeInputs.hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.desktop
       launch-webapp
       file-roller
       gsettings-desktop-schemas
diff --git a/profiles/sets/coding/agents/agents.nix b/profiles/sets/coding/agents/agents.nix
index df846d2..9ce4324 100644
--- a/profiles/sets/coding/agents/agents.nix
+++ b/profiles/sets/coding/agents/agents.nix
@@ -64,7 +64,7 @@
   home.packages = with pkgs; [
     agenix-cli
     agent-browser
-    m3taHomeInputs.agent-lib.packages.${pkgs.system}.agent-lib-cli
+    m3taHomeInputs.agent-lib.packages.${pkgs.stdenv.hostPlatform.system}.agent-lib-cli
     beads
     pi-coding-agent
     (qmd.override {
diff --git a/users/m3tam3re/identities/private.nix b/users/m3tam3re/identities/private.nix
index 6cccefa..70b71fe 100644
--- a/users/m3tam3re/identities/private.nix
+++ b/users/m3tam3re/identities/private.nix
@@ -44,107 +44,107 @@
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
-    matchBlocks = {
+    settings = {
       "github.com" = {
-        hostname = "github.com";
-        user = "m3tam3re";
-        port = 22;
-        identityFile = "~/.ssh/github";
+        HostName = "github.com";
+        User = "m3tam3re";
+        Port = 22;
+        IdentityFile = "~/.ssh/github";
       };
       "code.m3ta.dev" = {
-        hostname = "code.m3ta.dev";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/gitea";
+        HostName = "code.m3ta.dev";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/gitea";
       };
       "lkk-nix-1" = {
-        hostname = "89.58.10.189";
-        user = "lkk-admin";
-        identityFile = "~/.ssh/lkk-admin";
+        HostName = "89.58.10.189";
+        User = "lkk-admin";
+        IdentityFile = "~/.ssh/lkk-admin";
       };
       "m3-r1" = {
-        hostname = "202.61.226.110";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "202.61.226.110";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-deck" = {
-        hostname = "192.168.178.193";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.178.193";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-kratos-vm" = {
-        hostname = "192.168.122.43";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.122.43";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-helios" = {
-        hostname = "192.168.178.210";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.178.210";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-ares" = {
-        hostname = "192.168.1.30";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.1.30";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-atlas" = {
-        hostname = "152.53.85.162";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "152.53.85.162";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-hermes" = {
-        hostname = "204.168.229.93";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "204.168.229.93";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "hermes" = {
-        hostname = "46.224.0.92";
-        user = "admin";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "46.224.0.92";
+        User = "admin";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-zelda" = {
-        hostname = "95.217.189.186";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "95.217.189.186";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-skynet" = {
-        hostname = "m3-skynet";
-        user = "admin";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "m3-skynet";
+        User = "admin";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "m3-prox-1" = {
-        hostname = "192.168.1.110";
-        user = "root";
-        identityFile = "~/.ssh/m3tam3re";
+        HostName = "192.168.1.110";
+        User = "root";
+        IdentityFile = "~/.ssh/m3tam3re";
       };
       "shp-old" = {
-        hostname = "95.217.3.250";
-        port = 2222;
-        user = "m3tam3re";
-        identityFile = "~/.ssh/self-host-playbook";
+        HostName = "95.217.3.250";
+        Port = 2222;
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/self-host-playbook";
       };
       "shp-1" = {
-        hostname = "95.217.189.186";
-        port = 2222;
-        user = "m3tam3re";
-        identityFile = "~/.ssh/self-host-playbook";
+        HostName = "95.217.189.186";
+        Port = 2222;
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/self-host-playbook";
       };
       "AZ-CLD-1" = {
-        hostname = "152.53.186.119";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "152.53.186.119";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "AZ-PRM-1" = {
-        hostname = "192.168.152.76";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "192.168.152.76";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "git.az-gruppe.com" = {
-        hostname = "git.az-gruppe.com";
-        port = 2022;
-        user = "sascha.koenig";
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "git.az-gruppe.com";
+        Port = 2022;
+        User = "sascha.koenig";
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
     };
   };