diff --git a/cloud.go b/cloud.go
index b87d9a9..3abab1c 100644
--- a/cloud.go
+++ b/cloud.go
@@ -272,7 +272,7 @@ func runWebsocketClient() error {
 	// set the metrics when we successfully connect to the cloud.
 	cloudResetMetrics(true)
 
-	return handleWebRTCSignalWsConnection(c, true)
+	return handleWebRTCSignalWsMessages(c, true)
 }
 
 func authenticateSession(ctx context.Context, c *websocket.Conn, req WebRTCSessionRequest) error {
diff --git a/dev_deploy.sh b/dev_deploy.sh
index c3e3716..7fbf29e 100755
--- a/dev_deploy.sh
+++ b/dev_deploy.sh
@@ -67,10 +67,10 @@ make build_dev
 cd bin
 
 # Kill any existing instances of the application
-ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app || true"
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
 
 # Copy the binary to the remote host
-cat jetkvm_app | ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > $REMOTE_PATH/jetkvm_app"
+cat jetkvm_app | ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > $REMOTE_PATH/jetkvm_app_debug"
 
 # Deploy and run the application on the remote host
 ssh "${REMOTE_USER}@${REMOTE_HOST}" ash <<EOF
@@ -81,16 +81,16 @@ export LD_LIBRARY_PATH=/oem/usr/lib:\$LD_LIBRARY_PATH
 
 # Kill any existing instances of the application
 killall jetkvm_app || true
-killall jetkvm_app || true
+killall jetkvm_app_debug || true
 
 # Navigate to the directory where the binary will be stored
 cd "$REMOTE_PATH"
 
 # Make the new binary executable
-chmod +x jetkvm_app
+chmod +x jetkvm_app_debug
 
 # Run the application in the background
-PION_LOG_TRACE=jetkvm,cloud ./jetkvm_app
+PION_LOG_TRACE=jetkvm,cloud ./jetkvm_app_debug
 EOF
 
 echo "Deployment complete."
diff --git a/ui/src/routes/devices.$id.tsx b/ui/src/routes/devices.$id.tsx
index 64cfdad..fd4cc57 100644
--- a/ui/src/routes/devices.$id.tsx
+++ b/ui/src/routes/devices.$id.tsx
@@ -232,9 +232,10 @@ export default function KvmIdRoute() {
   const isSettingRemoteAnswerPending = useRef(false);
   const makingOffer = useRef(false);
 
+  console.log("isondevice", isOnDevice);
   const { sendMessage } = useWebSocket(
     isOnDevice
-      ? `ws://192.168.1.77/webrtc/signaling`
+      ? `ws://${window.location.host}/webrtc/signaling`
       : `${CLOUD_API.replace("http", "ws")}/webrtc/signaling?id=${params.id}`,
     {
       heartbeat: true,
diff --git a/web.go b/web.go
index aa6b914..4e93466 100644
--- a/web.go
+++ b/web.go
@@ -93,12 +93,12 @@ func setupRouter() *gin.Engine {
 
 	// A Prometheus metrics endpoint.
 	r.GET("/metrics", gin.WrapH(promhttp.Handler()))
-	r.GET("/webrtc/signaling", handleWebRTCSignal)
 
 	// Protected routes (allows both password and noPassword modes)
 	protected := r.Group("/")
 	protected.Use(protectedMiddleware())
 	{
+		protected.GET("/webrtc/signaling", handLocalWebRTCSignal)
 		protected.POST("/webrtc/session", handleWebRTCSession)
 		protected.POST("/cloud/register", handleCloudRegister)
 		protected.GET("/cloud/state", handleCloudState)
@@ -126,7 +126,7 @@ func setupRouter() *gin.Engine {
 // TODO: support multiple sessions?
 var currentSession *Session
 
-func handleWebRTCSignal(c *gin.Context) {
+func handLocalWebRTCSignal(c *gin.Context) {
 	cloudLogger.Infof("new websocket connection established")
 	// Create WebSocket options with InsecureSkipVerify to bypass origin check
 	wsOptions := &websocket.AcceptOptions{
@@ -141,14 +141,14 @@ func handleWebRTCSignal(c *gin.Context) {
 
 	// Now use conn for websocket operations
 	defer wsCon.Close(websocket.StatusNormalClosure, "")
-	err = handleWebRTCSignalWsConnection(wsCon, false)
+	err = handleWebRTCSignalWsMessages(wsCon, false)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 }
 
-func handleWebRTCSignalWsConnection(wsCon *websocket.Conn, isCloudConnection bool) error {
+func handleWebRTCSignalWsMessages(wsCon *websocket.Conn, isCloudConnection bool) error {
 	runCtx, cancelRun := context.WithCancel(context.Background())
 	defer cancelRun()