diff --git a/systems/x86_64-linux/node/default.nix b/systems/x86_64-linux/node/default.nix
index b0875d2..6ce3113 100644
--- a/systems/x86_64-linux/node/default.nix
+++ b/systems/x86_64-linux/node/default.nix
@@ -85,7 +85,12 @@
     apps.yubikey.enable = true;
   };
 
-  security.pam.sshAgentAuth.enable = true;
+  security.pam.sshAgentAuth = {
+    enable = true;
+    # Addresses issue 31611
+    # See: https://github.com/NixOS/nixpkgs/issues/31611
+    authorizedKeysFiles = lib.mkForce ["/etc/ssh/authorized_keys.d/%u"];
+  };
   security.pam.services.${config.aa.user.name}.sshAgentAuth = true;
 
   boot.loader.systemd-boot.enable = true;