diff --git a/client/index.html b/client/index.html
index 1f2bc16..333249f 100644
--- a/client/index.html
+++ b/client/index.html
@@ -1,69 +1,74 @@
 <!doctype html>
 <html lang="en">
-  <head>
+
+<head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Box Game</title>
     <link rel="shortcut icon" href="icon.png" type="image" />
     <link rel="stylesheet" href="styles.css" />
-  </head>
-  <body>
+</head>
+
+<body>
 
     <!-- ===== LOBBY SCREEN ===== -->
     <div id="nameScreen">
-      <div class="nameBox" id="lobbyBox">
-        <h2>Box Game</h2>
-        <p>Jump, collect hearts, beat your friends.</p>
+        <div class="nameBox" id="lobbyBox">
+            <h2>Box Game</h2>
+            <p>Jump, collect hearts, beat your friends.</p>
 
-        <label class="field-label">Your Name</label>
-        <input type="text" id="nameInput" placeholder="Enter your name…" maxlength="15" autofocus />
+            <label class="field-label">Your Name</label>
+            <input type="text" id="nameInput" placeholder="Enter your name…" maxlength="15" autofocus />
 
-        <div class="divider"><span>choose a room</span></div>
+            <div class="divider"><span>choose a room</span></div>
 
-        <!-- Create Room -->
-        <button id="createRoomBtn" class="btn-primary">✦ Create Private Room</button>
+            <!-- Create Room -->
+            <button id="createRoomBtn" class="btn-primary">✦ Create Private Room</button>
 
-        <!-- Join Room -->
-        <div class="join-row">
-          <input type="text" id="roomCodeInput" placeholder="Room code…" maxlength="5" />
-          <button id="joinRoomBtn" class="btn-secondary">Join</button>
-        </div>
+            <!-- Join Room -->
+            <div class="join-row">
+                <input type="text" id="roomCodeInput" placeholder="Room code…" maxlength="5" />
+                <button id="joinRoomBtn" class="btn-secondary">Join</button>
+            </div>
 
-        <p id="lobbyError" class="error-msg"></p>
-      </div>
+            <p id="lobbyError" class="error-msg"></p>
+        </div>
     </div>
 
     <!-- ===== IN-GAME HUD ===== -->
     <div id="hud" style="display:none;">
-      <button id="menuBtn" title="Options">☰</button>
-      <div id="roomBadge"></div>
+        <button id="menuBtn" title="Options">☰</button>
+        <div id="roomBadge"></div>
     </div>
 
     <!-- ===== OPTIONS MODAL (in-game) ===== -->
     <div id="optionsModal" style="display:none;">
-      <div class="modal-box">
-        <h3>Options</h3>
+        <div class="modal-box">
+            <h3>Options</h3>
 
-        <label class="field-label">Change Name</label>
-        <input type="text" id="newNameInput" placeholder="New name…" maxlength="15" />
-        <button id="saveNameBtn" class="btn-primary">Save Name</button>
+            <label class="field-label">Change Name</label>
+            <input type="text" id="newNameInput" placeholder="New name…" maxlength="15" />
+            <button id="saveNameBtn" class="btn-primary">Save Name</button>
 
-        <div class="divider"></div>
-        <div id="roomInfo"></div>
+            <div class="divider"></div>
+            <div id="roomInfo"></div>
 
-        <button id="copyCodeBtn" class="btn-secondary" style="margin-top:8px;">Copy Room Code</button>
-        <button id="closeModalBtn" class="btn-ghost" style="margin-top:8px;">Close</button>
-      </div>
+            <button id="copyCodeBtn" class="btn-secondary" style="margin-top:8px;">Copy Room Code</button>
+            <button id="closeModalBtn" class="btn-ghost" style="margin-top:8px;">Close</button>
+        </div>
     </div>
 
     <canvas id="gameCanvas"></canvas>
 
-    <script
-      src="https://cdn.socket.io/4.8.3/socket.io.min.js"
-      integrity="sha384-kzavj5fiMwLKzzD1f8S7TeoVIEi7uKHvbTA3ueZkrzYq75pNQUiUi6Dy98Q3fxb0"
-      crossorigin="anonymous"
-    ></script>
+    <script src="https://cdn.socket.io/4.8.3/socket.io.min.js"
+        integrity="sha384-kzavj5fiMwLKzzD1f8S7TeoVIEi7uKHvbTA3ueZkrzYq75pNQUiUi6Dy98Q3fxb0"
+        crossorigin="anonymous"></script>
+    <!-- ⬇ Change this URL when deploying to Vercel (point to your VM's gateway) -->
+    <script>
+        window.GATEWAY_URL = "http://localhost:8080";
+    </script>
     <script src="index.js"></script>
     <script src="game.js"></script>
-  </body>
+</body>
+
 </html>
diff --git a/client/index.js b/client/index.js
index 2ce0173..2d02a8f 100644
--- a/client/index.js
+++ b/client/index.js
@@ -1,17 +1,13 @@
-// ============== SOCKET CONNECTION ==============
-// Points to local server; update to production URL when deploying
-const _host = window.location.hostname;
-const SERVER_URL =
-  _host === "" || _host === "localhost" || _host === "127.0.0.1"
-    ? "http://localhost:3000"
-    : "https://server.boxgame.shadyggs.xyz";
-
-const socket = io(SERVER_URL, {
-  reconnectionDelay: 1000,
-  reconnectionDelayMax: 5000,
-  transports: ["websocket"],
-  autoConnect: true,
-});
+// ============== CONFIG ==============
+// GATEWAY_URL is injected by index.html as a <script> block so it works
+// both locally and on Vercel without a bundler.
+// Locally:  window.GATEWAY_URL = "http://localhost:3000"
+// Vercel:   window.GATEWAY_URL = "https://<your-vm-ip-or-domain>"
+const GATEWAY_URL = window.GATEWAY_URL || "http://localhost:3000";
+
+// socket is created lazily after a room is assigned so we know which
+// game-server host+port to connect to.
+let socket = null;
 
 let canvas = document.getElementById("gameCanvas");
 let ctx = canvas.getContext("2d");
@@ -43,15 +39,59 @@ let pName = localStorage.getItem("name") || "";
 if (pName) nameInput.value = pName;
 
 // ============== LOBBY ACTIONS ==============
-createRoomBtn.addEventListener("click", () => {
-  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-  let code = "";
-  for (let i = 0; i < 5; i++)
-    code += chars[Math.floor(Math.random() * chars.length)];
-  currentRoomCode = code;
+createRoomBtn.addEventListener("click", async () => {
+  const name = nameInput.value.trim();
+  if (!name) {
+    showLobbyError("Please enter a name first.");
+    return;
+  }
+  pName = name;
+  localStorage.setItem("name", pName);
+  setLobbyLoading(true);
+
+  try {
+    // Gateway picks the least-loaded game server, sets cookies
+    // (hostIp, port, roomID) and returns.
+    const res = await fetch(`${GATEWAY_URL}/createRoom`, {
+      credentials: "include", // receive the Set-Cookie headers
+    });
+
+    if (!res.ok) {
+      showLobbyError("No game servers available. Try again.");
+      setLobbyLoading(false);
+      return;
+    }
+
+    // Read the cookies the gateway just set
+    const hostIp = getCookie("hostIp");
+    const port = getCookie("port");
+    const roomID = getCookie("roomID");
+
+    if (!hostIp || !port || !roomID) {
+      showLobbyError("Server response missing. Try again.");
+      setLobbyLoading(false);
+      return;
+    }
+
+    // Connect socket directly to the assigned game-server
+    connectSocket(`http://${hostIp}:${port}`, () => {
+      socket.emit("createRoom", pName, roomID, (ack) => {
+        setLobbyLoading(false);
+        if (ack && ack.success) {
+          enterGame(ack.code);
+        } else {
+          showLobbyError("Failed to create room.");
+        }
+      });
+    });
+  } catch (e) {
+    console.error(e);
+    showLobbyError("Could not reach gateway.");
+    setLobbyLoading(false);
+  }
 });
 
-joinRoomBtn.addEventListener("click", () => {
+joinRoomBtn.addEventListener("click", async () => {
   const name = nameInput.value.trim();
   const code = roomCodeInput.value.trim().toUpperCase();
   if (!name) {
@@ -65,14 +105,43 @@ joinRoomBtn.addEventListener("click", () => {
   pName = name;
   localStorage.setItem("name", pName);
   setLobbyLoading(true);
-  socket.emit("joinRoom", { name: pName, code }, (res) => {
-    setLobbyLoading(false);
-    if (res && res.success) {
-      enterGame(res.code);
-    } else {
-      showLobbyError(res ? res.error : "Failed to join room.");
+
+  try {
+    // Ask gateway which server hosts this room
+    const res = await fetch(`${GATEWAY_URL}/add?roomID=${code}`, {
+      credentials: "include",
+    });
+
+    if (!res.ok) {
+      showLobbyError("Room not found or no servers available.");
+      setLobbyLoading(false);
+      return;
     }
-  });
+
+    const hostIp = getCookie("hostIp");
+    const port = getCookie("port");
+
+    if (!hostIp || !port) {
+      showLobbyError("Could not locate room server.");
+      setLobbyLoading(false);
+      return;
+    }
+
+    connectSocket(`http://${hostIp}:${port}`, () => {
+      socket.emit("joinRoom", { name: pName, code }, (ack) => {
+        setLobbyLoading(false);
+        if (ack && ack.success) {
+          enterGame(ack.code);
+        } else {
+          showLobbyError(ack ? ack.error : "Failed to join room.");
+        }
+      });
+    });
+  } catch (e) {
+    console.error(e);
+    showLobbyError("Could not reach gateway.");
+    setLobbyLoading(false);
+  }
 });
 
 roomCodeInput.addEventListener("keydown", (e) => {
@@ -101,6 +170,29 @@ function setLobbyLoading(loading) {
   createRoomBtn.textContent = loading ? "Connecting…" : "✦ Create Private Room";
 }
 
+// ============== SOCKET HELPERS ==============
+// Creates (or re-creates) the socket pointing at a specific game-server.
+function connectSocket(serverUrl, onConnected) {
+  if (socket) {
+    socket.removeAllListeners();
+    socket.disconnect();
+  }
+  socket = io(serverUrl, {
+    reconnectionDelay: 1000,
+    reconnectionDelayMax: 5000,
+    transports: ["websocket"],
+    autoConnect: true,
+  });
+  attachSocketListeners();
+  socket.once("connect", onConnected);
+}
+
+// Reads a cookie by name (needed because gateway uses Set-Cookie)
+function getCookie(name) {
+  const match = document.cookie.match(new RegExp("(^| )" + name + "=([^;]+)"));
+  return match ? decodeURIComponent(match[2]) : null;
+}
+
 function enterGame(code) {
   currentRoomCode = code;
   document.getElementById("nameScreen").style.display = "none";
@@ -109,82 +201,87 @@ function enterGame(code) {
 }
 
 // ============== CONNECTION HANDLING ==============
-socket.on("connect", () => {
-  console.log("Connected:", socket.id);
-  myID = socket.id;
-});
+// Listeners are registered via attachSocketListeners() each time a new
+// socket is created, so they are defined as named functions here.
+function attachSocketListeners() {
+  socket.on("connect", () => {
+    console.log("Connected:", socket.id);
+    myID = socket.id;
+  });
 
-socket.on("disconnect", (reason) => {
-  console.log("Disconnected:", reason);
-  players = {};
-  target = null;
-});
+  socket.on("disconnect", (reason) => {
+    console.log("Disconnected:", reason);
+    players = {};
+    target = null;
+  });
 
-socket.on("connect_error", (err) => {
-  console.error("Connection error:", err.message);
-  showLobbyError("Cannot connect to server.");
-});
+  socket.on("connect_error", (err) => {
+    console.error("Connection error:", err.message);
+    showLobbyError("Cannot connect to server.");
+  });
 
-// ============== WORLD INIT ==============
-socket.on("init", (newWorld) => {
-  world = newWorld;
-  resizeCanvas();
-});
+  // ============== WORLD INIT ==============
+  socket.on("init", (newWorld) => {
+    world = newWorld;
+    resizeCanvas();
+  });
 
-// ============== GAME STATE WITH DELTA MERGE ==============
-socket.on("gameState", (state) => {
-  if (state.target) target = state.target;
-  if (!state.players) return;
-
-  if (state.full) {
-    players = state.players;
-  } else {
-    for (const id in state.players) {
-      if (state.players[id] === null) {
-        delete players[id];
-      } else {
-        if (players[id]) {
-          const incoming = state.players[id];
-          const existing = players[id];
-          existing.x = incoming.x;
-          existing.y = incoming.y;
-          existing.width = incoming.width;
-          existing.height = incoming.height;
-          existing.color = incoming.color;
-          existing.velocityX = incoming.velocityX;
-          existing.velocityY = incoming.velocityY;
-          existing.name = incoming.name;
-          existing.score = incoming.score;
-          existing.id = incoming.id;
+  // ============== GAME STATE WITH DELTA MERGE ==============
+  socket.on("gameState", (state) => {
+    if (state.target) target = state.target;
+    if (!state.players) return;
+
+    if (state.full) {
+      players = state.players;
+    } else {
+      for (const id in state.players) {
+        if (state.players[id] === null) {
+          delete players[id];
         } else {
-          players[id] = state.players[id];
+          if (players[id]) {
+            const incoming = state.players[id];
+            const existing = players[id];
+            existing.x = incoming.x;
+            existing.y = incoming.y;
+            existing.width = incoming.width;
+            existing.height = incoming.height;
+            existing.color = incoming.color;
+            existing.velocityX = incoming.velocityX;
+            existing.velocityY = incoming.velocityY;
+            existing.name = incoming.name;
+            existing.score = incoming.score;
+            existing.id = incoming.id;
+          } else {
+            players[id] = state.players[id];
+          }
         }
       }
     }
-  }
-
-  if (socket.id && myID !== socket.id) myID = socket.id;
-});
 
-// ============== SERVER FULL ==============
-socket.on("serverFull", (msg) => {
-  alert(msg);
-});
+    if (socket.id && myID !== socket.id) myID = socket.id;
+  });
 
-// ============== SCORE EVENTS ==============
-let scorePopups = [];
+  // ============== SERVER FULL ==============
+  socket.on("serverFull", (msg) => {
+    alert(msg);
+  });
 
-socket.on("scoreEvent", (data) => {
-  scorePopups.push({
-    text: `${data.playerName} +1`,
-    x: data.x,
-    y: data.y,
-    life: 1.0,
-    decay: 0.02,
+  // ============== SCORE EVENTS ==============
+  socket.on("scoreEvent", (data) => {
+    scorePopups.push({
+      text: `${data.playerName} +1`,
+      x: data.x,
+      y: data.y,
+      life: 1.0,
+      decay: 0.02,
+    });
+    if (typeof spawnParticles === "function")
+      spawnParticles(data.x, data.y, "#00ff88", 8);
   });
-  if (typeof spawnParticles === "function")
-    spawnParticles(data.x, data.y, "#00ff88", 8);
-});
+}
+
+// scorePopups is declared here; listeners are registered in attachSocketListeners()
+let scorePopups = [];
 
 function updateScorePopups() {
   for (let i = scorePopups.length - 1; i >= 0; i--) {
diff --git a/gateway/bun.lock b/gateway/bun.lock
index ec10b13..e4a591a 100644
--- a/gateway/bun.lock
+++ b/gateway/bun.lock
@@ -5,9 +5,11 @@
     "": {
       "name": "gateway",
       "dependencies": {
+        "@types/cors": "^2.8.19",
         "@types/express": "^5.0.6",
         "@types/jsonwebtoken": "^9.0.10",
         "@types/redis": "^4.0.11",
+        "cors": "^2.8.6",
         "express": "^5.2.1",
         "jsonwebtoken": "^9.0.3",
         "redis": "^6.0.1",
@@ -37,6 +39,8 @@
 
     "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="],
 
+    "@types/cors": ["@types/cors@2.8.19", "", { "dependencies": { "@types/node": "*" } }, "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg=="],
+
     "@types/express": ["@types/express@5.0.6", "", { "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^5.0.0", "@types/serve-static": "^2" } }, "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA=="],
 
     "@types/express-serve-static-core": ["@types/express-serve-static-core@5.1.1", "", { "dependencies": { "@types/node": "*", "@types/qs": "*", "@types/range-parser": "*", "@types/send": "*" } }, "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A=="],
@@ -83,6 +87,8 @@
 
     "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
 
+    "cors": ["cors@2.8.6", "", { "dependencies": { "object-assign": "^4", "vary": "^1" } }, "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw=="],
+
     "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
 
     "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
@@ -169,6 +175,8 @@
 
     "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
 
+    "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="],
+
     "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="],
 
     "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="],
diff --git a/gateway/index.ts b/gateway/index.ts
index 8fabec5..9e54091 100644
--- a/gateway/index.ts
+++ b/gateway/index.ts
@@ -1,9 +1,21 @@
 import createRoom from "./routes/createRoom";
 import express from "express";
+import cors from "cors";
 import addToRoom from "./routes/addToRoom";
 
 const app = express();
 app.use(express.json());
+app.use(
+  cors({
+    origin: "http://localhost:3000",
+    credentials: true,
+  }),
+);
+
+// Allow the client origin to send credentials (cookies).
+// Locally: http://localhost:5500 or file:// – use * for dev convenience.
+// On Vercel: set ALLOWED_ORIGIN=https://your-app.vercel.app
+
 const port = process.env.PORT || 3000;
 let roomMaps: { [id: string]: { [id: string]: string | number } } = {};
 
diff --git a/gateway/package.json b/gateway/package.json
index d84b5b3..9a0e020 100644
--- a/gateway/package.json
+++ b/gateway/package.json
@@ -10,9 +10,11 @@
     "typescript": "^5"
   },
   "dependencies": {
+    "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/redis": "^4.0.11",
+    "cors": "^2.8.6",
     "express": "^5.2.1",
     "jsonwebtoken": "^9.0.3",
     "redis": "^6.0.1"
diff --git a/gateway/routes/addToRoom.ts b/gateway/routes/addToRoom.ts
index 9c32ffa..3644719 100644
--- a/gateway/routes/addToRoom.ts
+++ b/gateway/routes/addToRoom.ts
@@ -1,17 +1,15 @@
 import { type Request, type Response } from "express";
 import roomMaps from "../index.ts";
 const addToRoom = async (req: Request, res: Response) => {
-  if (!req.body) {
-    res.status(400).send("No body");
-    return;
-  }
-  const roomId = req.body.roomId;
-  if (roomId == undefined || roomMaps[roomId] == undefined) {
+  // roomID comes from the query string: GET /add?roomID=ABCDE
+  const roomId = (req.query.roomID as string | undefined)?.toUpperCase();
+  if (!roomId || roomMaps[roomId] == undefined) {
     res.status(400).send("Invalid room id");
     return;
   }
 
-  res.cookie("hostip", roomMaps[roomId]["hostIp"]);
+  // Use the same cookie names as createRoom so the client's getCookie() works
+  res.cookie("hostIp", roomMaps[roomId]["hostIp"]);
   res.cookie("port", roomMaps[roomId]["port"]);
   res.status(200).send("here have your server");
   return;
diff --git a/k8s.local.yaml b/k8s.local.yaml
new file mode 100644
index 0000000..1c5d0ab
--- /dev/null
+++ b/k8s.local.yaml
@@ -0,0 +1,75 @@
+# =============================================================================
+# LOCAL OVERRIDES for minikube testing
+# Apply AFTER k8s.yaml:  kubectl apply -f k8s.yaml -f k8s.local.yaml
+#
+# What this does:
+#   1. Swaps image names to the locally-built tags
+#   2. Sets imagePullPolicy: IfNotPresent so minikube uses cached images
+#   3. Sets ALLOWED_ORIGIN: "*" so the browser can hit the gateway without
+#      a Vercel domain configured
+# =============================================================================
+
+---
+# gateway – override image + pull policy
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gateway
+  namespace: box-game
+spec:
+  template:
+    spec:
+      containers:
+        - name: gateway
+          image: boxgame-gateway:local
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: PORT
+              value: "3000"
+            - name: SERVER_MANAGER_URL
+              value: "http://server-manager-svc.box-game.svc.cluster.local:4689"
+            - name: ALLOWED_ORIGIN
+              value: "*"
+
+---
+# server-manager – override image + pull policy
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: server-manager
+  namespace: box-game
+spec:
+  template:
+    spec:
+      serviceAccountName: server-manager-sa
+      containers:
+        - name: server-manager
+          image: boxgame-server-manager:local
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: PORT
+              value: "4689"
+
+---
+# game-server – override image + pull policy
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: game-server
+  namespace: box-game-servers
+spec:
+  template:
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
+      containers:
+        - name: game-server
+          image: boxgame-server:local
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: HOST_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: SERVER_MANAGER_URL
+              value: "http://server-manager-svc.box-game.svc.cluster.local:4689"
diff --git a/k8s.yaml b/k8s.yaml
index 2492114..4127b28 100644
--- a/k8s.yaml
+++ b/k8s.yaml
@@ -155,7 +155,7 @@ metadata:
   labels:
     app: gateway
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: gateway
@@ -315,10 +315,3 @@ spec:
             limits:
               cpu: "1000m"
               memory: "512Mi"
-          readinessProbe:
-            httpGet:
-              path: /status
-              port: 6000   # initial probe port; actual port is random — remove if causing issues
-            initialDelaySeconds: 3
-            periodSeconds: 10
-            failureThreshold: 3
diff --git a/server-manager/bun.lock b/server-manager/bun.lock
index 9e1e00b..e3255a6 100644
--- a/server-manager/bun.lock
+++ b/server-manager/bun.lock
@@ -6,7 +6,9 @@
       "name": "orchestrator",
       "dependencies": {
         "@kubernetes/client-node": "^1.4.0",
+        "@types/cors": "^2.8.19",
         "@types/express": "^5.0.6",
+        "cors": "^2.8.6",
         "express": "^5.2.1",
       },
       "devDependencies": {
@@ -30,6 +32,8 @@
 
     "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="],
 
+    "@types/cors": ["@types/cors@2.8.19", "", { "dependencies": { "@types/node": "*" } }, "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg=="],
+
     "@types/express": ["@types/express@5.0.6", "", { "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^5.0.0", "@types/serve-static": "^2" } }, "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA=="],
 
     "@types/express-serve-static-core": ["@types/express-serve-static-core@5.1.1", "", { "dependencies": { "@types/node": "*", "@types/qs": "*", "@types/range-parser": "*", "@types/send": "*" } }, "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A=="],
@@ -94,6 +98,8 @@
 
     "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
 
+    "cors": ["cors@2.8.6", "", { "dependencies": { "object-assign": "^4", "vary": "^1" } }, "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw=="],
+
     "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
 
     "delayed-stream": ["delayed-stream@1.0.0", "", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="],
@@ -190,6 +196,8 @@
 
     "oauth4webapi": ["oauth4webapi@3.8.6", "", {}, "sha512-iwemM91xz8nryHti2yTmg5fhyEMVOkOXwHNqbvcATjyajb5oQxCQzrNOA6uElRHuMhQQTKUyFKV9y/CNyg25BQ=="],
 
+    "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="],
+
     "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="],
 
     "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="],
@@ -278,6 +286,8 @@
 
     "@types/connect/@types/node": ["@types/node@26.0.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw=="],
 
+    "@types/cors/@types/node": ["@types/node@26.0.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw=="],
+
     "@types/express-serve-static-core/@types/node": ["@types/node@26.0.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw=="],
 
     "@types/node-fetch/@types/node": ["@types/node@26.0.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw=="],
@@ -300,6 +310,8 @@
 
     "@types/connect/@types/node/undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
 
+    "@types/cors/@types/node/undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
+
     "@types/express-serve-static-core/@types/node/undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
 
     "@types/node-fetch/@types/node/undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
diff --git a/server-manager/index.ts b/server-manager/index.ts
index 4e22b47..e7a7c1c 100644
--- a/server-manager/index.ts
+++ b/server-manager/index.ts
@@ -3,9 +3,15 @@ import express from "express";
 import assignServer from "./routes/assignServer";
 import Heap from "./helper/heap";
 import handleRegister from "./routes/handleRegister";
+import cors from "cors";
 import { type Request, type Response } from "express";
 
 const app = express();
+app.use(
+  cors({
+    credentials: true,
+  }),
+);
 const port = process.env.PORT || 4689;
 app.use(express.json());
 
diff --git a/server-manager/package.json b/server-manager/package.json
index ba18445..fd3f712 100644
--- a/server-manager/package.json
+++ b/server-manager/package.json
@@ -11,7 +11,9 @@
   },
   "dependencies": {
     "@kubernetes/client-node": "^1.4.0",
+    "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
+    "cors": "^2.8.6",
     "express": "^5.2.1"
   }
 }
