diff --git a/apps/gateway/src/app/events.gateway.ts b/apps/gateway/src/app/events.gateway.ts
index b29decd9c4351653349011fbe1fbddf2e1b142c8..078b0a825dce94ca9ea81026eb0ae9597f25aeae 100644
--- a/apps/gateway/src/app/events.gateway.ts
+++ b/apps/gateway/src/app/events.gateway.ts
@@ -2,7 +2,12 @@ import { WebSocketGateway, WebSocketServer } from "@nestjs/websockets";
 import { Server, WebSocket } from "ws";
 import { CloudEventDto } from "@ocm-engine/dtos";
 
-@WebSocketGateway()
+@WebSocketGateway({
+  cors: {
+    origin: "*", //set this with a config env
+  },
+  connectionTimeout: 45_000_000, //set this with a config env, higher value is needed for QA
+})
 export class EventsGateway {
   @WebSocketServer()
   server: Server;