diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
index d08af2c2..450b44c2 100644
--- a/gatewayservice/gateway-service.js
+++ b/gatewayservice/gateway-service.js
@@ -19,8 +19,11 @@ const genQuestServiceUrl = process.env.GEN_SERVICE_URL || 'http://localhost:8003
 const rankingServiceUrl = process.env.RANK_SERVICE_URL || 'http://localhost:8004';
 const questiongeneratorserviceUrl = process.env.QTEST_SERVICE_URL || 'http://localhost:8007';
 
+const devUrl = 'http://localhost';
+const prodUrl = 'http://51.142.17.139';
+
 const corsOptions = {
-  origin: ['http://localhost', 'http://51.142.17.139'],
+  origin: [devUrl, prodUrl],
   optionsSuccessStatus: 200
 }