diff --git a/pkg/pipelines/pipeline.go b/pkg/pipelines/pipeline.go
index 3c4141152..b925db04e 100644
--- a/pkg/pipelines/pipeline.go
+++ b/pkg/pipelines/pipeline.go
@@ -18,12 +18,12 @@ import (
 	"github.com/windsorcli/cli/pkg/kubernetes"
 	"github.com/windsorcli/cli/pkg/secrets"
 	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 	"github.com/windsorcli/cli/pkg/stack"
 	"github.com/windsorcli/cli/pkg/terraform"
 	"github.com/windsorcli/cli/pkg/tools"
 	"github.com/windsorcli/cli/pkg/workstation/network"
 	"github.com/windsorcli/cli/pkg/workstation/services"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
 	"github.com/windsorcli/cli/pkg/workstation/virt"
 )
 
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
index 81d796989..454758f11 100644
--- a/pkg/runtime/runtime.go
+++ b/pkg/runtime/runtime.go
@@ -15,11 +15,11 @@ import (
 	"github.com/windsorcli/cli/pkg/kubernetes"
 	"github.com/windsorcli/cli/pkg/secrets"
 	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 	"github.com/windsorcli/cli/pkg/terraform"
 	"github.com/windsorcli/cli/pkg/tools"
 	"github.com/windsorcli/cli/pkg/workstation/network"
 	"github.com/windsorcli/cli/pkg/workstation/services"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
 	"github.com/windsorcli/cli/pkg/workstation/virt"
 )
 
diff --git a/pkg/shell/secure_shell.go b/pkg/shell/secure_shell.go
index 6d6076dcd..bbd73e638 100644
--- a/pkg/shell/secure_shell.go
+++ b/pkg/shell/secure_shell.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 )
 
 // The SecureShell is a secure implementation of the Shell interface using SSH.
diff --git a/pkg/shell/secure_shell_test.go b/pkg/shell/secure_shell_test.go
index 8c7b7e717..69fd74bdd 100644
--- a/pkg/shell/secure_shell_test.go
+++ b/pkg/shell/secure_shell_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 )
 
 // The SecureShellTest is a test suite for the SecureShell implementation.
diff --git a/pkg/workstation/ssh/client.go b/pkg/shell/ssh/client.go
similarity index 100%
rename from pkg/workstation/ssh/client.go
rename to pkg/shell/ssh/client.go
diff --git a/pkg/workstation/ssh/client_test.go b/pkg/shell/ssh/client_test.go
similarity index 100%
rename from pkg/workstation/ssh/client_test.go
rename to pkg/shell/ssh/client_test.go
diff --git a/pkg/workstation/ssh/mock_client.go b/pkg/shell/ssh/mock_client.go
similarity index 100%
rename from pkg/workstation/ssh/mock_client.go
rename to pkg/shell/ssh/mock_client.go
diff --git a/pkg/workstation/ssh/mock_client_test.go b/pkg/shell/ssh/mock_client_test.go
similarity index 100%
rename from pkg/workstation/ssh/mock_client_test.go
rename to pkg/shell/ssh/mock_client_test.go
diff --git a/pkg/workstation/ssh/real_client.go b/pkg/shell/ssh/real_client.go
similarity index 100%
rename from pkg/workstation/ssh/real_client.go
rename to pkg/shell/ssh/real_client.go
diff --git a/pkg/workstation/ssh/shims.go b/pkg/shell/ssh/shims.go
similarity index 100%
rename from pkg/workstation/ssh/shims.go
rename to pkg/shell/ssh/shims.go
diff --git a/pkg/workstation/network/colima_network.go b/pkg/workstation/network/colima_network.go
index 655a61913..9f4e9db44 100644
--- a/pkg/workstation/network/colima_network.go
+++ b/pkg/workstation/network/colima_network.go
@@ -8,7 +8,7 @@ import (
 	"github.com/windsorcli/cli/pkg/constants"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/shell"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 )
 
 // The ColimaNetworkManager is a specialized network manager for Colima-based environments.
diff --git a/pkg/workstation/network/network.go b/pkg/workstation/network/network.go
index f3663d640..e1c4a00f6 100644
--- a/pkg/workstation/network/network.go
+++ b/pkg/workstation/network/network.go
@@ -9,8 +9,8 @@ import (
 	"github.com/windsorcli/cli/pkg/constants"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 	"github.com/windsorcli/cli/pkg/workstation/services"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
 )
 
 // The NetworkManager is a core component that manages local development network configuration.
diff --git a/pkg/workstation/network/network_test.go b/pkg/workstation/network/network_test.go
index caaad6359..d68df51ff 100644
--- a/pkg/workstation/network/network_test.go
+++ b/pkg/workstation/network/network_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/windsorcli/cli/pkg/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/shell/ssh"
 	"github.com/windsorcli/cli/pkg/workstation/services"
-	"github.com/windsorcli/cli/pkg/workstation/ssh"
 )
 
 // =============================================================================