diff --git a/home/gabriel/features/cli/ssh.nix b/home/gabriel/features/cli/ssh.nix
index d77ce052..8638d68c 100644
--- a/home/gabriel/features/cli/ssh.nix
+++ b/home/gabriel/features/cli/ssh.nix
@@ -30,9 +30,7 @@ in {
           }
         ];
         setEnv.WAYLAND_DISPLAY = "/%d/.waypipe/display";
-        extraConfig = ''
-          StreamLocalBindUnlink yes
-        '';
+        extraOptions.StreamLocalBindUnlink = "yes";
       };
     };
   };
diff --git a/hosts/common/global/openssh.nix b/hosts/common/global/openssh.nix
index 5cc061ac..bc3d484d 100644
--- a/hosts/common/global/openssh.nix
+++ b/hosts/common/global/openssh.nix
@@ -21,6 +21,8 @@ in {
       StreamLocalBindUnlink = "yes";
       # Allow forwarding ports to everywhere
       GatewayPorts = "clientspecified";
+      # Let WAYLAND_DISPLAY be forwarded
+      AcceptEnv = "WAYLAND_DISPLAY";
     };
 
     hostKeys = [