diff --git a/.config/scripts/yubikey.sh b/.config/scripts/yubikey.sh
new file mode 100755
index 0000000..c41c21f
--- /dev/null
+++ b/.config/scripts/yubikey.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Path to your YubiKey identifiers
+YUBIKEY_5C_IDENTIFIER="28854922"
+YUBIKEY_NANO_IDENTIFIER="33923085"
+YUBIKEY_SERIAL=$(ykman list | sed -n 's/.*Serial: //p')
+
+# Check for connected YubiKeys
+if echo "$YUBIKEY_SERIAL" | grep -q "$YUBIKEY_5C_IDENTIFIER"; then
+  export GIT_SSH_COMMAND='ssh -i ~/.ssh/id_ed25519_sk'
+elif echo "$YUBIKEY_SERIAL" | grep -q "$YUBIKEY_NANO_IDENTIFIER"; then
+  export GIT_SSH_COMMAND='ssh -i ~/.ssh/id_ed25519_sk_nano'
+else
+  echo "No YubiKey detected!"
+  exit 1
+fi
+
+# Now run the Git command passed to the script
+git "$@"
diff --git a/ansible/roles/packages/vars/Archlinux.yml b/ansible/roles/packages/vars/Archlinux.yml
index 98cff7b..8c37002 100644
--- a/ansible/roles/packages/vars/Archlinux.yml
+++ b/ansible/roles/packages/vars/Archlinux.yml
@@ -119,6 +119,7 @@ required_packages_pacman:
   - pcsclite
   - ccid
   - libfido2
+  - yubikey-manager
 
 flatpak_remote:
   - { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo" }