diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 27354e7..12626de 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -286,7 +286,7 @@
 
     programs.ssh = {
       enable = true;
-      addKeysToAgent = "yes";
+      matchBlocks."*".addKeysToAgent = "yes";
       matchBlocks = {
         bert = {
           user = "root";
diff --git a/sam/configuration.nix b/sam/configuration.nix
index de3e7ac..2d9183c 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -221,7 +221,7 @@
 
     programs.ssh = {
       enable = true;
-      addKeysToAgent = "yes";
+      matchBlocks."*".addKeysToAgent = "yes";
       includes = [
         "config.d/*"
       ];