diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index db2e191..630dff2 100644
--- a/modules/services/ssh.nix
+++ b/modules/services/ssh.nix
@@ -102,6 +102,7 @@ in
         certs = mkEnableOption "Enable Janus and Soteria SSH targets";
         homelab = mkEnableOption "Enable various Homelab targets";
         dev = mkEnableOption "Enable development targets";
+        tailscale = mkEnableOption "Enable tailscale targets";
       };
     };
 
@@ -198,8 +199,18 @@ in
               hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
               user = "john";
               extraOptions = {
-                RequestTTY = "force";
-                RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
+                RequestTTY = "auto";
+                # RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
+              };
+            };
+          })
+          (lib.mkIf cfg.matchSets.tailscale {
+            "jdl-docker" = {
+              hostname = "jdl-docker.tailcf205.ts.net";
+              user = "john";
+              extraOptions = {
+                RequestTTY = "auto";
+                # RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
               };
             };
           })