diff --git a/base/defaults.nix b/base/defaults.nix
index 0a52911..b42a3e6 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -9,6 +9,7 @@
             settings = {
                 PasswordAuthentication = false;
                 KbdInteractiveAuthentication = false;
+                X11Forwarding = true;
             };
         };
 
diff --git a/hosts/Rupert.nix b/hosts/Rupert.nix
index ef0fa9c..d1d9fdb 100644
--- a/hosts/Rupert.nix
+++ b/hosts/Rupert.nix
@@ -103,8 +103,9 @@ in
     services.openssh = {
         enable = true;
         settings = {
-            # ForwardX11 = true;
             PasswordAuthentication = false;
+            KbdInteractiveAuthentication = false;
+            X11Forwarding = true;
         };
     };