diff --git a/system/all/sshd-known-hosts-private.nix b/system/all/sshd-known-hosts-private.nix
index ce71490..2a7d4ed 100644
--- a/system/all/sshd-known-hosts-private.nix
+++ b/system/all/sshd-known-hosts-private.nix
@@ -8,42 +8,48 @@
         "sterni.private"
         config.module.cluster.services.tinc.private.hosts.sterni.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC2qlEEnS0GmB93UL+Nzqk991amYk3tvQKjPvPP7XBfLksPQ0BhvUFy0fchnYLwxDgFydF4KjL6M2QttfRGWbcE/Ui0UczSpgw0GR+ou9tdQetq/iG963pvNvJvfu0ckfwMG4ia2WoSj4/SRKlpYwFwsqXzOgKo9lCauMcoNP6UsdqIhdcZJD9/VSNz9RTq+vdEIGs8Ldvq7NgPjPe5abct85fwwenOX+LyaG+5DQt5hAUdjFSXGRw5fZvaGteqO1TraQOgoJWvbJlPwFkSJnxnbi/6yibMBakNpVkCqSYMEDFVmFmGU4VOhZ2ukm3BkdiyML81LaawXnIwB0G2/ICFE2IuE9TvWj49k/T+KSzTmcS4tcq+rLcKGKNaWL/Rz6KvT3W4pz6Dv9pfeJYNkJP7J1lu84pMc4UZMAo87Ps4QDlV8yvDCw8htIFnGRKpu4AOXlKs97SLiovWGCiyFYpm+uPV9Lk6KjEqMGTfw537Cr1e6xcvwZ9FOJsk3dLL4o21MEsDIpwiAn7yCnVsDSsglRk5nhYFtrvZvkijyWk05v6ZkyT+zBw1qNSOEAi8NS/dkbbaDT2wy+WOggcjzU+LnDjmtWedPAaVRJK83aeSsl27cMdeKms+8TNbjhCyGKvG2lzXg0n13QYs5/93Bm9urGWqF8AplPEgOm1GJvJLOw== root@sterni";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyHmHJy2Va45p9mn+Hj3DyaY5yxnQIKvXeACHjzgSKt";
+
     };
     "workout.private" = {
       hostNames = [
         "workout.private"
         config.module.cluster.services.tinc.private.hosts.workout.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuaaOYiwmQBiVqh1WRnP3SiOgkX7d3sZkE/E6F8hrIHcl77fOaaLZt1JizrZDWJAfBoZJtNzJiCxJeG3FZ+Gm3TH462yau7JnzYQPDV/nCeWFAviUcfS3xz2CrK7m5ukUIAglWyFO1MajF190TcSE2xnQ4stJ3XNl42cQA6MXUdUQJEqafTItRFN82Y7acwzALUTTaT++g3PzjRWLMwTz1k35V4OCsm+9WF0FAjuJCHQgZqiqPduu4sX+JKqmUZTtlZ9yYs1bp6yfjcmjGHuQLJUKQxMKLL5ZU4RaXSKmsg5M/kpWqO9HKJpuL2KoRll3S9AlWGY5iq9KuJeNnYj/YO4b9F4ycNQFuHNhmJiwnfcfz8WUaEqnKwq3aJcTW0SqBTdHeJ//WJCnI3qLQNQ2PfXaR0UZ5+hJHL0EsJbPiWmzaWws2XvYvawevggidwNqS9dvKS8PAYPiLkFi/AXVaMg6FOfppP+iKS/s0ua7DCVJuicHHoPwXre50oc0nhgVUGXnPOhvf9GIkJweUb3hgRuNuACWQWCMt5YyfFS2Zf+vpbteNbYoj2YP5hV/TPwlOrTHKTItfWcIUg0rmU0LS/WQfZMihUnLAq4mpao3saQ/pN/yNwa9Vqg8ah46opcval59g+fLsMKXhvGo/vBmGc/uhrCouqtvrdKrO4QhsKw== root@workout";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjotuQJHDaL0fPY7yA2dIBVWRYOkp7/ablY60psMQ6w";
+
     };
     "sputnik.private" = {
       hostNames = [
         "sputnik.private"
         config.module.cluster.services.tinc.private.hosts.sputnik.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZwxp9syIYpQPNML6L5bcRCglpKCWm3/6hYpvecybhWmMmIg0Mqi+VBICL1tNVU3SI2akSaYhYa5JSQPu9iANYIcxzg7pOY+bZf36w79fMpnGGsu/dfKZtN8dL2EOOdgu2Dz120aVgvgB0bM0wsp2rD1mXlrOAZ9SH2Knun/r0ZRYW6dnRXStFPQzmEtLg6KeEUfQ09yoHOkjEbHA3CiqLAtUQnwctf2h8K+Ppc8uTeDyv5WXtdfSmyUQwKuLfIOxMA4I2mFOPb5d+xmY8e0raRopMgeP1MVmj+8B4ZH2u6l4WeVVHxywRAMgN/ljQlBjl+cqcsk6yZro+GNRM+ch17RQUfoZGrY6pfVHExu6UhiMy/dfPkhEmpzw7Pl5NT1bssRO3BUgbNOyI0JZdrnzXnlDGJSS8ZEaavHaALbD0K+QSzGbmwcvAXh+/QnpMo/Uuiomo8Gc5BzHORgEBo3PICITAgyDlmNbYeVOP9XejrfcCJABMGvlwICji+5K5xpEuPmpgQSJBOf/ZBubaxOb/GCVtRUjSMe+i4CT9sPGAaDISEKNFbxdGYmy3e13OXQ9jq5l1FykYY/pxMjgDAPdRVKOYdCZ0tWW/pnzvmRlYyuy+UwIPvlyhC6NM7FWK8Ef2IPoc4stALvsqnByb1p8lBFfi6VSR9TKiwXZ1c4EH9Q== root@nixos";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICTLXDTqUtl0BQgzH1O7CRulGCRN1P4KU8imL/wjYFh8";
+
     };
     "workhorse.private" = {
       hostNames = [
         "workhorse.private"
         config.module.cluster.services.tinc.private.hosts.workhorse.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaNYDLDRH///qgyaEtueb6HNhF+ZyVDk6QKgN7xbrfa5LN+XBjgeLjK4Cw6BOIeZ2e0plbPaUbfqWmNsky7tBVSx2MzITRQf6aUPrSyijsEH5vXrH2Cy6aGJqpzXQYXglqHLP8S0cnMwIed50zSO8uNDwmQ787zZChfF+tk5RhuzMuSBVXE7Gg8NHA9rGygqzb+F05b3wDGFkuNQORv8e4Tau9uakRaFa9DzENdQMu91YIFpgT76YuwQnKz6YJytmPGeqTS0qcJCBEikDST/+8bCegK4sx7RJI38eoN9ZIrmxNGz/iQbl1BmD/147khqzj6/uKL0uDR2Bc+F2/tAzdxPpieTN4XlDCf6GRFvjGq/Wv52hPsVq88VmtFfoNoEpdN480MJG+EerppxhdGDXg6FqwYOnw4ezblTky6zxjW+fYhbo0Y5YVTEhoO1hEaODT9OAtacXTR2WpXl3sIwmptM7Gg7THtM1+tv5+4v/frVvrwjuu/n0pJkY3gyKiMepuxWOwmYpg9Zpt7p/y1pCzwY+Bd1frO8f60fwtXBiMcTFAO16F0GrQcqrWIblK5fYREvQ4raRNf6rapZXP/cY1IWRA0vMDG1Y8RJFj20cnHQ1cZRWLsoo4pp4/6GluuqGzMwu7A0FMVAIo7EeaV3Zx4VD2oHBL4DUWREuc9jFasQ== root@workhorse";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDaK0Vv33TuGQa/B5p54sGilgpYvfKkBaBGlEBpIk1QB";
+
     };
     "porani.private" = {
       hostNames = [
         "porani.private"
         config.module.cluster.services.tinc.private.hosts.porani.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDoANrFaqJwNwSRGECqfZSUX8K86Nb7S6+ed25bLPrLM9MyNdlQJu1qKYk7+VafUUm1cHGrYXtf9kzvBVR6CWWKlZQd90MaevmsFKwhHqeLtvwKI3VsdlkCLALseaKsGtIk6X7/o8rfrZvHELGGddieJK4A0y7+iRJWCb85JhCeV8RfYfJO9HSFvpr1ppGAn83mmBKim9CoAFQJlOnC/XbYGo0KMcUdO0unrVfPWpdy3Pi12rFdABd3A7YHvQz3UDFEQijAVw7N5k+BthoTvkEYfiCgnIEATBpag6Go9BrdlI2LebI2TQwyXP27OqRDyDJdXaxsqaya09hta9Uh3k7usLF4Tzy6aeLjtGiTNxa7AUP5+IhipMA1/aDiiu7b9fpK/JmbvZV3LUtOvqLvaheDIzNPAi24qaZT7EmyAva7ufrF8lUg8Bms6dQ/6dZ/mq2nS6iJAAGqIoPSGWQAdDdlCDFz3WhcQyrvbOZhEK6Ksn9EC2L7MqXbBTtJSb5PLUhOTbMzvAvq2jTAwECLcHt1vQsEk0oZ3+72rC8SBCzbWxSZygiHQK9xXFFmeX1HN35/NWHlVQkh0kG9TQAsa9obnRQDDGceXwAqqWyzoSXIDk1qjKgey7rhJZAE2lynxpShAG7k7iVdqOi6GnnB7NEeyGAl6V+fl4vUpu2NU8EdJw==";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWWUcI7Oc8iAJx0PABv2jhDTKIxFlOdoREsM6VdCQ8M";
+
     };
     "pepe.private" = {
       hostNames = [
         "pepe.private"
         config.module.cluster.services.tinc.private.hosts.pepe.tincIp
       ];
-      publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJ8n/ac1AdrQg5cDtSmU+F9i8klgm/q/l7bITrBkDpRXC3TjFCcfK8oSq7gXCvEnPKGiWEEb80G/kDM7YkIffNIg1HFgtb/req7eKEP1VOBRm2Eu4k1/KSV1A3ssvfKbrH2ntwupuhCU6KwISpkvdc7LNomt9ZZ70f6qUpU9OPu9jlQDCV9G6xboeIdNeRabYXtOB+g24Ev/SbaOr6VcIapAQc1j3eqJo3u2bdVQfzIeVkxfwjlQimSvFX0cLTi3P0NDf0oIXL+AwhSziLWt8NDf1n+gR9tZgEu/vRUUcPBMS7a1NYoHXy9KryIQbK3qCh8dRwsE17zTlasmZ+o9Ki6nsGbId1MKx0O9VunDpdB146JCN/Z5LZy/g0GMfB5SjBbxayC3epi84Cy9MEy+xZA4pAFsLttPn1xYNUoc+L/5X4IKH/xDZSQZw2Dbg9AGj1gfwJofqPOccWcmH0dqE7ZA7Jkj9afwqdPNMyC0d3jqTJQFnodYvRewWmgLVlnRiFKqY8OCxtr8KFDbRpqml5SpI9cq6czxWzqzag1RR/fB4aoeNfHytvU3fbGSl2A6WGh9DplO1R1f/n559HN7z/i6CmtqAsqnPQpe8ms15r9Tj35fAxyeV5XSqtAWsAFKd3l6t3/XQOS1bF+ooyudfo9dAtuT2V82sPolo98L4v7w== root@pepe";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPlva+Vdj8WmQPlbQLN3qicMz5AAsyTzK53BincxtAz";
+
     };
     "cracksucht.de" = {
       hostNames = [ "cracksucht.de" ];
diff --git a/system/desktop/home-manager/ssh.nix b/system/desktop/home-manager/ssh.nix
index d9a3a0e..28489c7 100644
--- a/system/desktop/home-manager/ssh.nix
+++ b/system/desktop/home-manager/ssh.nix
@@ -14,7 +14,6 @@ with lib;
       "*.private" = {
         identityFile = "~/.ssh/card_rsa.pub";
         identitiesOnly = true;
-        extraOptions.HostKeyAlgorithms = "ssh-rsa";
         user = "root";
       };
       "*.ingolf-wagner.de" = {