diff --git a/ascanius/configuration.nix b/ascanius/configuration.nix
index 1cc7682..ffc8d7b 100644
--- a/ascanius/configuration.nix
+++ b/ascanius/configuration.nix
@@ -36,5 +36,9 @@ in
   virtualisation.virtualbox.host.enable = true;
 
   users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
-
+  services.xserver.displayManager.sessionCommands = ''
+    gpg-connect-agent /bye
+    unset SSH_AGENT_PID
+    export SSH_AUTH_SOCK="''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+  '';
 }
diff --git a/sshkeys.nix b/sshkeys.nix
index 313272c..814e3da 100644
--- a/sshkeys.nix
+++ b/sshkeys.nix
@@ -1,5 +1,5 @@
 {
 	public = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZv+hBDmjxF8h9Gxwvy0o7sMgOsqwp8pVj9AlpG90Y7agvkOm2IGtFueVfiDe0yWPXT0/EIiVWcPhWwcVkbY/BkypPJSMLnlcQ6ld+aO1g+BtdDaVuxcTSvQ77UCT2p+wftxoq1EiUdlhTsXpPucrBd+5NOde+jlPBE4qChIAf2zhOIByJAGT+M4Ie3eV4p5S9LB9CMI4s32gNUBbSA8UDmkjpBXkf9a1TZzdkOGWUmUFXt53/O8LZlGK9kkA5TsjM2xaxDjCLWf5wEcey4JsEggi1prE4aB68Q7+kdbvDiVSEFyZn0A/A9RXHBRAgW8yPdh+EGC56iDW/wkGxWBY5";
 	deploy = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGGQytwzcR2DrnYQlnZSbXNpSClCFFvy4gqak8r7u8nYplu5azdq6yNN5TRAEoseiTl2WbdnwgVNluze5FF8a5p2XDyu754YF9nyNbQvzWt5dyjFLemDbj5vAzUnQY+52L9qwo5OK3oG2qZx76T7B5CnEN/JDJxGT3xveRyVUSTnNj/N0iiYVsOcEzGpkdKf/5QOGHuZWJrqwz2CNalKbXAJU9mEOHAH+fSxSmf99YCwwF+GyfYUL3eGIZ9CP1pUQX0CZKq8APW+rLlXJuGOrLTNYWd2jTzea95oiyMQeDhidTeyyPWi2GI32tRHVegg6wMzFo7b/m1f/BI18h9psn";
-	yorick = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDi8Dn148E6k4TMBnRtkLRP4FSNSe54fn1vOtGtyE9eLIa5kg1SaGsijRmlCddILxiNO6uZsp6thaWwL+QWbBBEi9kdPpzyPDlrBkKJqOTJJH+94Gxnfxu8SkiQMoI5XOTKvzmhsw4hhHKDmGKlOv/qQjwzjsoyAO3AvBIgXAlstnDVWYgMK9ijf7FxR//YTDYqM8ABNJZvcsDXyN1feJWtJ0KYvd2Mg8kS/sVoAjEEaXsto3V3HaqxMQn5mRicJARNBJUCT/BOGrc50wy9zwBOvPZO72js2s6D62fzRDBcHuOoSv/z45DDcZxhonPg6OZcYe7dMKnFw1e/ndzwze6V";
+	yorick = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDo1N5E6qkb3McJOvv0PqI7E8iYLAcjil5RWc+zeTtN/";
 }