diff --git a/machines/thinkman/hardware-configuration.nix b/machines/thinkman/hardware-configuration.nix
index a587254..f7fac78 100644
--- a/machines/thinkman/hardware-configuration.nix
+++ b/machines/thinkman/hardware-configuration.nix
@@ -22,8 +22,8 @@ in
     };
     graphics.cpuFlavor = cpuFlavor;
     keychron.enable = true;
-    nitrokey.enable = true;
     sound.enable = true;
     thunderbolt.enable = true;
+    yubikey.enable = true;
   };
 }
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 3033a40..5e1318f 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -9,7 +9,7 @@
     ./firmware
     ./graphics
     ./keychron
-    ./nitrokey
+    ./yubikey
     ./sound
     ./thunderbolt
   ];
diff --git a/modules/hardware/nitrokey/default.nix b/modules/hardware/nitrokey/default.nix
deleted file mode 100644
index ed406b5..0000000
--- a/modules/hardware/nitrokey/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.hardware.nitrokey;
-in
-{
-  options.my.hardware.nitrokey = {
-    enable = lib.mkEnableOption "nitrokey configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.udev.packages = [ pkgs.nitrokey-udev-rules ];
-    programs = {
-      ssh.startAgent = false;
-      gnupg.agent = {
-        enable = true;
-        enableSSHSupport = true;
-      };
-    };
-  };
-}
diff --git a/modules/hardware/yubikey/default.nix b/modules/hardware/yubikey/default.nix
new file mode 100644
index 0000000..e267524
--- /dev/null
+++ b/modules/hardware/yubikey/default.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.hardware.yubikey;
+in
+{
+  options.my.hardware.yubikey = {
+    enable = lib.mkEnableOption "yubikey configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.udev.packages = [ pkgs.yubikey-personalization ];
+    programs = {
+      ssh.startAgent = false;
+      gnupg.agent = {
+        enable = true;
+        enableSSHSupport = true;
+      };
+    };
+
+    environment.systemPackages = with pkgs; [
+      yubikey-manager
+    ];
+  };
+}