diff --git a/infra/libkookie/configuration/workstation/gpg/default.nix b/infra/libkookie/configuration/workstation/gpg/default.nix
index cb7d0eb4d91..a08b73a20d9 100644
--- a/infra/libkookie/configuration/workstation/gpg/default.nix
+++ b/infra/libkookie/configuration/workstation/gpg/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, home-manager, ... }:
 
 {
   programs.gnupg.agent = {
diff --git a/infra/libkookie/configuration/workstation/yubikey/default.nix b/infra/libkookie/configuration/workstation/yubikey/default.nix
new file mode 100644
index 00000000000..f139e3395e0
--- /dev/null
+++ b/infra/libkookie/configuration/workstation/yubikey/default.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+with pkgs;
+{
+  services.udev.packages = [ yubikey-personalization ];
+
+  # Sometimes this is needed, so we keep it here
+  # services.pcscd.enable = true;
+  
+  # FIXME: Can I remove these?
+  # Previously these rules were required to make
+  # Yubikey support work on `uwu`, but maybe this
+  # is redundant with special udev rules?
+  environment.systemPackages = [ yubikey-manager yubikey-personalization ];
+}
diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index e7d86e28459..dce777eedaf 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -33,6 +33,9 @@ in
 
     <configuration/workstation/xkblayout>
     
+    <configuration/workstation/yubikey>
+    <configuration/workstation/gpg>
+
     
     #################################################################
     # home-manager modules that exist entirely in userspace