diff --git a/home-manager/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix
index 386c110..4896613 100644
--- a/home-manager/modules/programs/ssh.nix
+++ b/home-manager/modules/programs/ssh.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }: {
+  services.ssh-agent = {
+   enable = true;
+  };
   programs.ssh = {
     # SSH configuration
     enable = true;
@@ -16,10 +19,17 @@
     # enable session reuse
     controlMaster = "auto";
     controlPersist = "10m";
+    # setup agent
+    addKeysToAgent = "yes";
     # Configure known hosts
     matchBlocks = {
       "tides" = {
         hostname = "150.136.87.190";
+        forwardAgent = true;
+      };
+      "driftwood" = {
+        hostname = "driftwood.stranger.systems";
+        forwardAgent = true;
       };
       "static.stranger.systems" = {
         hostname = "129.153.226.221";