diff --git a/keys/pgp/joachim.asc b/keys/pgp/joachim.asc
new file mode 100644
index 0000000..91b862e
--- /dev/null
+++ b/keys/pgp/joachim.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEY2pTLBYJKwYBBAHaRw8BAQdAcx6u70TFOfOFTWrGaorv7vSOFDTBpQ5z/1+g
+y7dsHGC0JUpvYWNoaW0gU3RyYW1rZSA8am9hY2hpbUBzdHJhbWtlLmNvbT6ImQQT
+FgoAQRYhBLGhYBG4a6y1attxPbcSA50jEzZhBQJjalMsAhsDBQkDw5wEBQsJCAcC
+AiICBhUKCQgLAgQWAgMBAh4HAheAAAoJELcSA50jEzZhYcwA/3mpekeMVRQt5VfF
+oyxMVumf6lzkqKUrKcxIOEa7M+4OAQDLeWd9IUFahGrwdNjRPv+KWJHUDyPgaHPA
+cBLWUYjSB7g4BGNqUywSCisGAQQBl1UBBQEBB0CR3xJzMNpmRcNdWqRbGxv8hgXf
+PwlOWa8ApxuP2iuoFAMBCAeIfgQYFgoAJhYhBLGhYBG4a6y1attxPbcSA50jEzZh
+BQJjalMsAhsMBQkDw5wEAAoJELcSA50jEzZhXeoA/3B6i7k36nMQlL1v2/rN4gQJ
+2Rneetr36gEMFzf2k4G6AQC9nlNEiQY7Vp16PnxJJYTalNpNpMbaJ54c37A4VrgD
+Dg==
+=5V3N
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/keys/ssh/joachim b/keys/ssh/joachim
new file mode 100644
index 0000000..dcf3458
--- /dev/null
+++ b/keys/ssh/joachim
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9akyIw74vwJ+8NM7um8NhTcMO7okD46jYkodHTLYe6Oj7QR/kHZD3VEu5Wy7mN33av0Pr6gqeqzPBmn1kxa+J0FnD83rjm989Z9mKbpjt1EtAd9WSlx1MmixHCSgTvHezaiUHmikWdUK3XLITZeGOM3fyDDV5Nqm1rvg5PMV2mAMP9j8T2RsWweGUgcoE8RIfH4WA6t1ZhP4Px01UWozFadeQ6qRG8hMfq3gWKC9lGLAlgUHqpUuNVJ8I45znR/UhrR+h4VF0mkCYFM3JP0z+o/KwDTfcLlRCMxcY3rpRvbrhmgkqHuPTqwQfiBxTyZvWb2IeCkKVFAk0WmFb1M4Elnk+tJrF2G7yzpyRNilin8/P7pQk7M3BAY2m1iZA6u7cBUxWFbzRqRluRR8R+HAk9hqjtr0XmMifq0K7ZX31u48Ss/lgNXa2KHHYeI79++mfELhIhNXAznkhIAT1PhRKeL12RtDVjzfEd1JbHR8hE1L/n0K3Hyfzw/bJXBAwJJ8= joach@DESKTOP-FOASM6G
diff --git a/modules/base.nix b/modules/base.nix
index 3811431..8d6cc81 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -42,6 +42,7 @@
       ../keys/ssh/jonasga
       ../keys/ssh/rouven
       ../keys/ssh/helene
+      ../keys/ssh/joachim
     ];
   };