diff --git a/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts b/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
index 82fdde4..c65239f 100644
--- a/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
+++ b/apps/server/src/domains/room/application/useCases/joinRoomUseCase.ts
@@ -6,7 +6,7 @@
   roomManager: JoinRoomPort;
   socketId: string;
   data: roomTypes.JoinRoomPayload;
-  publishRoomUpdate: (roomId: string, room: roomTypes.Room) => void;
+  publishRoomUpdate: (roomId: roomTypes.Room["roomId"], room: roomTypes.Room) => void;
 };
 
 export const joinRoomUseCase = ({
diff --git a/apps/server/src/domains/room/application/useCases/roomDisconnectUseCase.ts b/apps/server/src/domains/room/application/useCases/roomDisconnectUseCase.ts
index bff69ef..2e54090 100644
--- a/apps/server/src/domains/room/application/useCases/roomDisconnectUseCase.ts
+++ b/apps/server/src/domains/room/application/useCases/roomDisconnectUseCase.ts
@@ -5,7 +5,7 @@
 type RoomDisconnectUseCaseParams = {
   roomManager: DisconnectRoomPort;
   socketId: string;
-  publishRoomUpdate: (roomId: string, room: roomTypes.Room) => void;
+  publishRoomUpdate: (roomId: roomTypes.Room["roomId"], room: roomTypes.Room) => void;
 };
 
 export const roomDisconnectUseCase = ({
diff --git a/apps/server/src/network/handlers/game/createGameEventPublisher.ts b/apps/server/src/network/handlers/game/createGameEventPublisher.ts
index 408d743..f8db10a 100644
--- a/apps/server/src/network/handlers/game/createGameEventPublisher.ts
+++ b/apps/server/src/network/handlers/game/createGameEventPublisher.ts
@@ -1,11 +1,11 @@
 import { Server } from "socket.io";
 import { protocol } from "@repo/shared";
-import type { gridMapTypes, playerTypes } from "@repo/shared";
+import type { gridMapTypes, playerTypes, roomTypes } from "@repo/shared";
 import { createEmitToAll } from "@server/network/adapters/socketEmitters";
 import type { CommonHandlerContext } from "../CommonHandler";
 
-type RoomId = string;
-type SocketId = string;
+type RoomId = roomTypes.Room["roomId"];
+type SocketId = playerTypes.PlayerData["id"];
 type PongPayload = { clientTime: number; serverTime: number };
 type GameStartPayload = { startTime: number };
 type CurrentPlayersPayload = playerTypes.PlayerData[];
diff --git a/apps/server/src/network/handlers/room/createRoomEventPublisher.ts b/apps/server/src/network/handlers/room/createRoomEventPublisher.ts
index 2c30cf2..49798e7 100644
--- a/apps/server/src/network/handlers/room/createRoomEventPublisher.ts
+++ b/apps/server/src/network/handlers/room/createRoomEventPublisher.ts
@@ -4,7 +4,7 @@
 import type { roomTypes } from "@repo/shared";
 import type { CommonHandlerContext } from "../CommonHandler";
 
-type RoomId = string;
+type RoomId = roomTypes.Room["roomId"];
 type RoomUpdatePayload = roomTypes.Room;
 
 export type RoomEventPublisher = {