diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index f3808677c39020956cd9d6a7db3de40c0bcb403d..b661995785ed0267cdf45adce3ae5e4726df415a 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -1,6 +1,6 @@
 let
   username = "jolheiser";
-  key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa";
 in
 {
   imports = [

diff --git a/machines/dragonwell/git-pr.nix b/machines/dragonwell/git-pr.nix
index c5e2bc71b4f06e96bb11feb9c075f7706244dbfa..bcb7b506eb2a7b3336aa263227f328afba83bf45 100644
--- a/machines/dragonwell/git-pr.nix
+++ b/machines/dragonwell/git-pr.nix
@@ -3,9 +3,7 @@   services.git-pr = {
     enable = true;
     openFirewall = true;
     url = "pr.jolheiser.com";
-    admins = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
-    ];
+    admins = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB" ];
     sshPort = 7448;
     enableWeb = true;
     webPort = 7449;

diff --git a/machines/dragonwell/ugit.nix b/machines/dragonwell/ugit.nix
index ab531913a45399a4ef3aa32fbd08bda797f2e648..c7ef77e513623cf422d4a0e091a746ead8f30246 100644
--- a/machines/dragonwell/ugit.nix
+++ b/machines/dragonwell/ugit.nix
@@ -3,7 +3,7 @@   services.ugit = {
     enable = true;
     openFirewall = true;
     authorizedKeys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB"
     ];
     tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key
     config = {

diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age
index 19e1c68c9616466985fe72951fac39e910418e78..1f1e089e70daac9ea40938279e88db0876760946 100644
Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ