diff --git a/home-manager/features/ssh.nix b/home-manager/features/ssh.nix
index 05ded47..a0d8a10 100644
--- a/home-manager/features/ssh.nix
+++ b/home-manager/features/ssh.nix
@@ -1,5 +1,17 @@
 { ... }:
 {
+  programs.ssh = {
+    enable = true;
 
+    # Automatically add keys to agent when used
+    # Other options are "no" and "confirm"
+    addKeysToAgent = "yes";
+
+    matchBlocks = {
+      "mcp.haven" = {
+        user = "drew";
+      };
+    };
+  };
   services.ssh-agent.enable = true;
 }
diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix
index 755e0ab..2e18416 100644
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -18,12 +18,15 @@
     enableBashIntegration = true;
     extraConfig = ''
       local act = wezterm.action;
+
       return {
         color_scheme = "tokyonight_night",
         window_background_opacity = 0.80,
         font = wezterm.font "FiraCode Nerd Font",
         font_size = 13,
         hide_tab_bar_if_only_one_tab = true,
+        -- Disable the built-in SSH agent in favor of the system one
+        mux_enable_ssh_agent = false,
         -- Keys
         keys = {
           -- paste from the clipboard