diff --git a/secrets/id_ed25519_sk-464.age b/secrets/id_ed25519_sk-464.age
index 69ee78e..0951631 100644
Binary files a/secrets/id_ed25519_sk-464.age and b/secrets/id_ed25519_sk-464.age differ
diff --git a/secrets/id_ed25519_sk-485.age b/secrets/id_ed25519_sk-485.age
index e391fee..1ec62eb 100644
Binary files a/secrets/id_ed25519_sk-485.age and b/secrets/id_ed25519_sk-485.age differ
diff --git a/users/b12f/default.nix b/users/b12f/default.nix
index 861f674..f3968aa 100644
--- a/users/b12f/default.nix
+++ b/users/b12f/default.nix
@@ -32,14 +32,15 @@ in {
         description = "b12f";
         password = "$y$j9T$GR.fND1YY6/2deXcEMHx1.$QBuvjIxPkDtFXrkes0T582L6jF7gfHhseFts64qC8xB";
         fullName = "Benjamin Bädorf";
-        email = "hello@benjaminbaedorf.eu";
-        gpgKeyId = "4406E80E13CD656C";
+        email = "git@benjaminbaedorf.eu";
+        gpgKeyId = "FC623BBCBD2604D5CC9D90BAE77B0AAAF0D9B76B";
         publicKeys = [
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoYNvXWunQYFORRjcYH1F98+zr20U79ROh+gmaC7AY/x3yf4y8uyMayF56VgQLVNwgEchT5t4dNb9qo2+1oUnjiKrKAVfQMN6WMMMEr4F4WT784uvBx5Uo6vmhgAa+xoo62c4TV2Uf49ZiPd+zAApBHW1F/whPtunPF28Wfr9g+ozSidhnAr+3nkfJh331tz9s+wgQ39AFzFWftQ60Guulpfj8SaVyxyv/yZZAuFpXNzN0Cz4fWBIWFOsib6Z8y+SlUCzSzOguZ7FygHjwlvOxoISsASAuf0OfUKHxVshiL5F5AX1ddmUgXbUKUTp/3Iunr74pfOQC8TXzZHqhrlFzYDmK5J9E6eADSpgx++bCCaHycl73BWeertCBZSHBXeb3Db9HX+mxwpfP3alVAt4ZqQb3YD/VB7XGDvHbmLn+wSfecO2qA9PxiA0yX7e2BZLN9r3G3bRNSk0GpnYM0i84FE9IipiKKnWVjj7J0UPQmz7rzAn2Lki1CnX9PDdxZneqTxgpBomHJt4H+vXMw13scA4xxEDBvfS5KkjbEJqWLbfklCoER6nV3NPLZ6CBl0Xe/VQBSkqEuUEIXih/oa8emDOGUODNF75ck5NJmKiGg6AFZoeiDa7PZMIxhhOq4vsR2Ty43rztUJ0CMX7iSIk3Eql7kqNdvrJaJ7z0GBsiw== b12f@biolimo"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmiF8ndGhnx2YAWbPDq14fftAwcJ0xnjJIVTotI12OO4SPX/SwH5Yp8C8Kf002qN9FbFmaONzq3s8TYpej13JubhfsQywNuFKZuZvJeHzmOwxsANW86RVrWT0WZmYx9a/a1TF9rPQpibDVt60wX8yLdExaJc5F1SvIIuyz1kxYpz36wItfR6hcwoLGh1emFCmfCpebJmp3hsrMDTTtTW/YNhyeSZW74ckyvZyjCYtRCJ8uF0ZmOSKRdillv4Ztg8MsUubGn+vaMl6V6x/QuDuehEPoM/3wBx9o22nf+QVbk7S1PC8EdT/K5vskn4/pfR7mDCyQOq1hB4w4Oyn0dsfX pi@ssrtc"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwyNsGCMuyI9x2IxYEbYIL6oYsEfe1wqhHaRxSnK9oc10ge1LJni5o7g6XgryoQpCD9YenImcCxwkKblmlLQ2327uoVC2PUo07li1uT0eIPk0TQoxwp6besFs7/LEzZlgWQsc3gkEXmjk/E0mu0U6z2fkqciJ/ZxWYt9fLP6jBG47U9878rSaZ7k7Ilv6oRA3suArH189k1nerk/tonS4EWXeHZxHh/Eu0tqwmxN/6+g2GicYn6b+MbFQVdQAkctqT5Yz9USm9UKzbaAuZ799u0dJzagHm9JJZOr8r11ENtAkY9kAzRzm3u/ACiSdVzyLdjAK6m0dIPhp3OhedzuHiI6/wRll60tYtQTH1XwUpVbtir3+DT+jwZgO1zH3yL4iNh79kuUo+UEg1ZmGkSZRzSS2vb5qr0J5aSJmCd5sNB7a01PTtSlQPOqSF9PB+UmcLDF7JoKFub0KT/gRZ5neZkXTYQ/Y05qtaaFVlOVISijnm+sLUvKBv6OW8oYXIHBk= b12f@chocolatebar"
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHx4A8rLYmFgTOp1fDGbbONN8SOT0l5wWrUSYFUcVzMPTyfdT23ZVIdVD5yZCySgi/7PSh5mVmyLIZVIXlNrZJg= @b12f Yubi Main"
           "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEST9eyAY3nzGYNnqDYfWHu+89LZsOjyKHMqCFvtP7vrgB7F7JbbECjdjAXEOfPDSCVwtMMpq8JJXeRMjpsD0rw= @b12f Yubi Backup"
+          "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKOpBCq5YqEVi4sKAZHk82luuf+DSvsPeRxsHYTVPJdZAAAACHNzaDpiMTJm yubi@464"
+          "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDyxaJNw0jXREOzQfa0E2RQE/xLD/VddDldbdSmS8uf9AAAACHNzaDpiMTJm yubi@485"
         ];
       };
     };
diff --git a/users/b12f/home.nix b/users/b12f/home.nix
index a487cc2..fa75b9e 100644
--- a/users/b12f/home.nix
+++ b/users/b12f/home.nix
@@ -9,6 +9,20 @@ with lib; let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 in {
+  age.secrets."id_ed25519_sk-464" = {
+    file = "${flake.self}/secrets/id_ed25519_sk-464.age";
+    mode = "400";
+    owner = psCfg.user.name;
+    path = "/home/${psCfg.user.name}/.ssh/id_ed25519_sk-464";
+  };
+
+  age.secrets."id_ed25519_sk-485" = {
+    file = "${flake.self}/secrets/id_ed25519_sk-485.age";
+    mode = "400";
+    owner = psCfg.user.name;
+    path = "/home/${psCfg.user.name}/.ssh/id_ed25519_sk-485";
+  };
+
   home-manager.users."${psCfg.user.name}" = {
     home.packages = [
       pkgs.zoom-us
@@ -17,6 +31,13 @@ in {
     programs.ssh = {
       enable = true;
       matchBlocks = {
+        "*" = {
+          identityFile = [
+            "/home/${psCfg.user.name}/.ssh/id_ed25519_sk-464"
+            "/home/${psCfg.user.name}/.ssh/id_ed25519_sk-485"
+          ];
+        };
+
         "git.pub.solar" = {
           user = "gitea";
         };