diff --git a/homes/x86_64-linux/coded@ocicat/default.nix b/homes/x86_64-linux/coded@ocicat/default.nix
index 55c0c8d..7edc711 100644
--- a/homes/x86_64-linux/coded@ocicat/default.nix
+++ b/homes/x86_64-linux/coded@ocicat/default.nix
@@ -50,9 +50,9 @@
     includes = [ "~/.ssh/config.d/*" ];
 
     matchBlocks = {
-      "ssh.clicks.codes" = {
-        port = 29418;
-        identityFile = "~/.ssh/ClicksGerrit";
+      "github.com" = {
+        user = "git";
+        identityFile = [ "~/.ssh/OnTheGo5cResident" ];
       };
       "greylag.minion" = {
         identityFile = [ "~/.ssh/OnTheGo5cResident" ];
@@ -60,6 +60,10 @@
       "shorthair" = {
         identityFile = [ "~/.ssh/OnTheGo5cResident" ];
       };
+      "git.auxolotl.org" = {
+        user = "forgejo";
+        identityFile = [ "~/.ssh/OnTheGo5cResident" ];
+      };
     };
   };
 
diff --git a/homes/x86_64-linux/coded@shorthair/default.nix b/homes/x86_64-linux/coded@shorthair/default.nix
index 33f4e2e..187ea51 100644
--- a/homes/x86_64-linux/coded@shorthair/default.nix
+++ b/homes/x86_64-linux/coded@shorthair/default.nix
@@ -72,16 +72,19 @@
     includes = [ "~/.ssh/config.d/*" ];
 
     matchBlocks = {
-      "ssh.clicks.codes" = {
-        port = 29418;
-        identityFile = "~/.ssh/id_clicks_git";
-      };
       "github.com" = {
         user = "git";
-        identityFile = [ "~/.ssh/github_sk_nano" ];
+        identityFile = [ "~/.ssh/ShorthairNanoResident" "~/.ssh/OnTheGo5cResident" ];
       };
-      "greylag.minion.clicks.domains" = {
-        identityFile = [ "~/.ssh/5cNanoResident" ];
+      "greylag.minion" = {
+        identityFile = [ "~/.ssh/ShorthairNanoResident" "~/.ssh/OnTheGo5cResident" ];
+      };
+      "ocicat" = {
+        identityFile = [ "~/.ssh/ShorthairNanoResident" "~/.ssh/OnTheGo5cResident" ];
+      };
+      "git.auxolotl.org" = {
+        user = "forgejo";
+        identityFile = [ "~/.ssh/ShorthairNanoResident" "~/.ssh/OnTheGo5cResident" ];
       };
     };
   };
diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix
index 9039633..e49ddf9 100644
--- a/modules/nixos/users/default.nix
+++ b/modules/nixos/users/default.nix
@@ -26,8 +26,8 @@
       "dialout"
     ];
     openssh.authorizedKeys.keys = [
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrwKN4dJQ0BiLmjsA/66QHhu06+JyokWtHkLcjhWU79AAAABHNzaDo= coded-yk5c-resident"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOMSUqXuH1bQZJc9rLV0H7/UY0c2BlkzAKWkwrXFWbQ7AAAABHNzaDo= coded@5CNano"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrwKN4dJQ0BiLmjsA/66QHhu06+JyokWtHkLcjhWU79AAAABHNzaDo= OnTheGo5cResident"
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOMSUqXuH1bQZJc9rLV0H7/UY0c2BlkzAKWkwrXFWbQ7AAAABHNzaDo= ShorthairNanoResident"
     ];
   };