diff --git a/group_vars/all/archusers.yml b/group_vars/all/archusers.yml
index 56710b2922957ad250e29151a1ad43e57caaf9bb..c519e196982660a8039bd6ee7cd30a850aeb4162 100644
--- a/group_vars/all/archusers.yml
+++ b/group_vars/all/archusers.yml
@@ -418,9 +418,13 @@ arch_users:
   heftig:
     name: "Jan Steffens"
     email: "heftig@archlinux.org"
-    ssh_key: heftig.pub
+    ssh_key: heftig_nitrokey.pub
     additional_ssh_keys:
-      - name: heftig_dragon.pub
+      - name: heftig_yubikey.pub
+        hosts:
+          - all
+      # Used to publish nightly packages
+      - name: heftig_build.pub
         hosts:
           - homedir.archlinux.org
     groups:
diff --git a/pubkeys/heftig_dragon.pub b/pubkeys/heftig_build.pub
similarity index 100%
rename from pubkeys/heftig_dragon.pub
rename to pubkeys/heftig_build.pub
diff --git a/pubkeys/heftig_nitrokey.pub b/pubkeys/heftig_nitrokey.pub
new file mode 100644
index 0000000000000000000000000000000000000000..b6c3e5461ac241b631da53933b71b8666c9f700a
--- /dev/null
+++ b/pubkeys/heftig_nitrokey.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLyG2MHXtzhaqAMukDjvQT8BTQpZfLYEOogJkDJDo7V cardno:000F_8991A69D
diff --git a/pubkeys/heftig.pub b/pubkeys/heftig_yubikey.pub
similarity index 64%
rename from pubkeys/heftig.pub
rename to pubkeys/heftig_yubikey.pub
index c7aa49c074e13a7003900aaa0ae5da13c1884191..c906c0cb2457e652984b0f26e830a04c638c6b20 100644
--- a/pubkeys/heftig.pub
+++ b/pubkeys/heftig_yubikey.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNbRKSVPySqXMjiyxYXhhusHw7a1pokxZ2paLiEQ7Ex heftig-ed25519
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNbRKSVPySqXMjiyxYXhhusHw7a1pokxZ2paLiEQ7Ex cardno:13_062_363