diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
index 9172eeea..558e6dd5 100644
--- a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
+++ b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -140,7 +140,7 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
 
         ideResolvingJob = cs.launch {
             try {
-                val executor = withTimeout(Duration.ofSeconds(60)) { createRemoteExecutor() }
+                val executor = withTimeout(Duration.ofSeconds(60)) { createRemoteExecutor(selectedWorkspace) }
                 retrieveIDES(executor, selectedWorkspace)
                 if (ComponentValidator.getInstance(tfProject).isEmpty) {
                     installRemotePathValidator(executor)
@@ -212,11 +212,12 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
         })
     }
 
-    private suspend fun createRemoteExecutor(): HighLevelHostAccessor {
+    private suspend fun createRemoteExecutor(selectedWorkspace: WorkspaceAgentModel): HighLevelHostAccessor {
         return HighLevelHostAccessor.create(
             RemoteCredentialsHolder().apply {
-                setHost("coder.${wizard.selectedWorkspace?.name}")
+                setHost("coder.${selectedWorkspace.name}")
                 userName = "coder"
+                port = 22
                 authType = AuthType.OPEN_SSH
             },
             true
@@ -351,4 +352,4 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
     companion object {
         val logger = Logger.getInstance(CoderLocateRemoteProjectStepView::class.java.simpleName)
     }
-}
\ No newline at end of file
+}