diff --git a/backend/WebsocketHandler.js b/backend/WebsocketHandler.js
index 37ad4f9..1ffacde 100644
--- a/backend/WebsocketHandler.js
+++ b/backend/WebsocketHandler.js
@@ -2,14 +2,11 @@ const WebSocket = require('ws');
 
 function createWebSocketServer(port) {
   const wss = new WebSocket.Server({ port });
-  let connected = false;
 
   // function to handle WebSocket connections
 
   function handleConnection(ws) {
-    if (!connected) {
     console.log('Client connected');
-    connected = true;
 
     // listen for messages from the client
     ws.on('message', (message) => {
@@ -19,12 +16,7 @@ function createWebSocketServer(port) {
     // listen for close events
     ws.on('close', () => {
       console.log('Client disconnected');
-      connected = false;
-    });}
-    else
-    {
-        console.log('WebSocket connection already established');
-    }
+    });
   }
 
 
diff --git a/backend/sync.js b/backend/sync.js
index b8f3cbd..354664a 100644
--- a/backend/sync.js
+++ b/backend/sync.js
@@ -4,7 +4,7 @@ const db = require("./db");
 const axios = require("axios");
 
 const ws = require("./WebsocketHandler");
-const sendMessageToClients = ws(8080);
+const sendMessageToClients = ws(process.env.WS_PORT || 3004);
 
 const router = express.Router();
 
diff --git a/src/pages/components/settings/TerminalComponent.js b/src/pages/components/settings/TerminalComponent.js
index 1c13faa..0c4ba36 100644
--- a/src/pages/components/settings/TerminalComponent.js
+++ b/src/pages/components/settings/TerminalComponent.js
@@ -7,7 +7,7 @@ const TerminalComponent = () => {
 
   useEffect(() => {
     // create a new WebSocket connection
-    const socket = new WebSocket('ws://localhost:8080');
+    const socket = new WebSocket(`ws://${window.location.hostname+':'+(process.env.WS_PORT || 3004)}/ws`);
 
     // handle incoming messages
     socket.addEventListener('message', (event) => {
diff --git a/src/setupProxy.js b/src/setupProxy.js
index 17958ec..0d9085a 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -32,7 +32,7 @@ module.exports = function(app) {
   app.use(
     '/ws',
     createProxyMiddleware({
-      target: 'ws://127.0.0.1:8080',
+      target: `ws://127.0.0.1:${process.env.WS_PORT || 3004}`,
       changeOrigin: true,
       ws: true,
     })