diff --git a/webui/src/types.ts b/webui/src/types.ts
index f79e35d..6b020e6 100644
--- a/webui/src/types.ts
+++ b/webui/src/types.ts
@@ -90,6 +90,7 @@
 	todo_content?: string;
 	skaband_addr?: string;
 	link_to_github?: boolean;
+	ssh_connection_string?: string;
 }
 
 export interface TodoItem {
diff --git a/webui/src/web-components/sketch-container-status.ts b/webui/src/web-components/sketch-container-status.ts
index 560044a..e0c19cd 100644
--- a/webui/src/web-components/sketch-container-status.ts
+++ b/webui/src/web-components/sketch-container-status.ts
@@ -547,7 +547,10 @@
   }
 
   getSSHHostname() {
-    return `sketch-${this.state?.session_id}`;
+    // Use the ssh_connection_string from the state if available, otherwise fall back to generating it
+    return (
+      this.state?.ssh_connection_string || `sketch-${this.state?.session_id}`
+    );
   }
 
   // Format GitHub repository URL to org/repo format