diff --git a/home/jonas.nix b/home/jonas.nix
index f8d0b38..8aefaee 100644
--- a/home/jonas.nix
+++ b/home/jonas.nix
@@ -34,8 +34,8 @@
 
   # Make session variables available in systemd units
   # SEE: https://github.com/nix-community/home-manager/pull/5543
-  systemd.user.settings.Manager.DefaultEnvironment =
-    lib.mapAttrs (_: lib.mkDefault) config.home.sessionVariables;
+  # systemd.user.settings.Manager.DefaultEnvironment =
+  #   lib.mapAttrs (_: lib.mkDefault) config.home.sessionVariables;
 
   xdg.mimeApps = {
     enable = true;
diff --git a/modules/home/yubikey.nix b/modules/home/yubikey.nix
index 26b5d19..87230dd 100644
--- a/modules/home/yubikey.nix
+++ b/modules/home/yubikey.nix
@@ -37,7 +37,10 @@
       '';
     };
     home.sessionVariables = {
-      SSH_AUTH_SOCK = "$\{XDG_RUNTIME_DIR\}/gnupg/S.gpg-agent.ssh";
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh";
+    };
+    systemd.user.settings.Manager.DefaultEnvironment = lib.mapAttrs (_: lib.mkDefault) {
+      SSH_AUTH_SOCK = "/run/user/%U/gnupg/S.gpg-agent.ssh";
     };
   };
 }