diff --git a/_machines/ares.yml b/_machines/ares.yml
index f75a8fb..6754d85 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -18,6 +18,7 @@ users:
     master_key: "0xB5C002530C6A2053"
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
+  has_yubikey: true
 
 screen:
   1: DisplayPort-0
diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 60d6d83..cb2641f 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -17,6 +17,7 @@ users:
     MACHINE_HAS_NEXTCLOUD: "false"
     MACHINE_HAS_RESTIC_BACKUP: "true"
     MACHINE_HAS_ELEMENT: "false"
+  has_yubikey: false
 - name: hannes-private
   group: tpp
   vt: 2
@@ -30,6 +31,7 @@ users:
     MACHINE_HAS_NEXTCLOUD: "true"
     MACHINE_HAS_RESTIC_BACKUP: "false"
     MACHINE_HAS_ELEMENT: "true"
+  has_yubikey: true
 
 screen:
   1: DP-1-1
diff --git a/i3/i3status.conf.j2 b/i3/i3status.conf.j2
index 4f35b85..7b9d9e8 100644
--- a/i3/i3status.conf.j2
+++ b/i3/i3status.conf.j2
@@ -20,7 +20,9 @@ general {
 
 
 order += spotify
+{% if user.has_yubikey %}
 order += "yubikey"
+{% endif %}
 order += "volume_status output"
 order += "volume_status input"
 order += "wifi"