diff --git a/.gitignore b/.gitignore
index 739bd16..eef81a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,10 @@ crash.log
 *.log
 .env
 
+./api-gateway/.env
+./cart-service/.env
+./menu-service/.env
+./order-service/.env    
+./user-service/.env
+
 
diff --git a/api-gateway/index.js b/api-gateway/index.js
index 603a143..be0ce74 100644
--- a/api-gateway/index.js
+++ b/api-gateway/index.js
@@ -1,28 +1,68 @@
+// const express = require('express');
+// const { createProxyMiddleware } = require('http-proxy-middleware');
+// const cors = require("cors");
+// const app = express();
+
+// // app.use(cors({
+// //     origin: 'https://blendrush.netlify.app',
+// //     methods: ['GET', 'POST', 'PUT', 'DELETE'],
+// //     credentials: true
+// // }));
+
+// app.use('/api/menu', createProxyMiddleware({ target: 'http://menu-service:3001', changeOrigin: true }));
+// app.use('/api/orders', createProxyMiddleware({ target: 'http://order-service:3002', changeOrigin: true }));
+// app.use('/api/user', createProxyMiddleware({ target: 'http://user-service:3003', changeOrigin: true }));
+// app.use('/api/carts', createProxyMiddleware({ target: 'http://cart-service:3005', changeOrigin: true }));
+
+// app.listen(3000, () => {
+//     console.log("API Gateway running on port 3000");
+// });
+
+
+// const express = require('express');
+// const { createProxyMiddleware } = require('http-proxy-middleware');
+// const cors = require("cors");
+// const app = express();
+
+// // app.use(cors({
+// //     origin: 'https://blendrush.netlify.app',
+// //     methods: ['GET', 'POST', 'PUT', 'DELETE'],
+// //     credentials: true
+// // }));
+
+// app.use('/api/menu', createProxyMiddleware({ target: 'http://menu-service:3001', changeOrigin: true }));
+// app.use('/api/orders', createProxyMiddleware({ target: 'http://order-service:3002', changeOrigin: true }));
+// app.use('/api/user', createProxyMiddleware({ target: 'http://user-service:3003', changeOrigin: true }));
+// app.use('/api/carts', createProxyMiddleware({ target: 'http://cart-service:3005', changeOrigin: true }));
+
+// app.listen(3000, () => {
+//     console.log("API Gateway running on port 3000");
+// });
+
+
 const express = require('express');
+const cors = require('cors');
 const { createProxyMiddleware } = require('http-proxy-middleware');
-const cors = require("cors");
+
+
 const app = express();
 
 app.use(cors({
-    origin: 'https://blendrush.netlify.app',
-    methods: ['GET', 'POST', 'PUT', 'DELETE'],
+    origin: 'https://blendrush.netlify.app', // your frontend URL
+    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
     credentials: true
 }));
 
-app.options('*', cors());
+// Handle preflight requests
+// app.options('*', cors({
+//     origin: 'https://blendrush.netlify.app',
+//     credentials: true
+// }));
 
+// Proxy routes
 app.use('/api/menu', createProxyMiddleware({ target: 'http://menu-service:3001', changeOrigin: true }));
 app.use('/api/orders', createProxyMiddleware({ target: 'http://order-service:3002', changeOrigin: true }));
 app.use('/api/user', createProxyMiddleware({ target: 'http://user-service:3003', changeOrigin: true }));
 app.use('/api/carts', createProxyMiddleware({ target: 'http://cart-service:3005', changeOrigin: true }));
 
-
-
-// app.use('/api/menu', createProxyMiddleware({ target: 'http://localhost:3001', changeOrigin: true }));
-// app.use('/api/orders', createProxyMiddleware({ target: 'http://localhost:3002', changeOrigin: true }));
-// app.use('/api/user', createProxyMiddleware({ target: 'http://localhost:3003', changeOrigin: true }));
-// app.use('/api/carts', createProxyMiddleware({ target: 'http://localhost:3005', changeOrigin: true }));
-
-app.listen(3000, () => {
-    console.log("API Gateway running on port 3000");
-});
+app.listen(3000, () => console.log("API Gateway running on port 3000"));
diff --git a/docker-compose.yml b/docker-compose.yml
index 031996a..d530e16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,8 @@ services:
 
   menu-service:
     build: ./menu-service
+    env_file:
+      - .env
     ports:
       - "3001:3001"
     environment:
@@ -23,6 +25,8 @@ services:
 
   user-service:
     build: ./user-service
+    env_file:
+      - .env
     ports:
       - "3003:3003"
     environment:
@@ -37,6 +41,8 @@ services:
 
   order-service:
     build: ./order-service
+    env_file:
+      - .env
     ports:
       - "3002:3002"
     environment:
@@ -45,6 +51,8 @@ services:
 
   cart-service:
     build: ./cart-service
+    env_file:
+      - .env
     ports:
       - "3005:3005"
     environment:
diff --git a/menu-service/.env b/menu-service/.env
deleted file mode 100644
index cea9bd1..0000000
--- a/menu-service/.env
+++ /dev/null
@@ -1,5 +0,0 @@
-MONGODB_URI="mongodb+srv://blissme:Blissme%40123@menu-service.kl9itfh.mongodb.net/?retryWrites=true&w=majority&appName=menu-service"
-CLOUDINARY_CLOUD_NAME=dxpeb7uve
-CLOUDINARY_API_KEY=241237125277574
-CLOUDINARY_API_SECRET=UKo6AM5gOyJ4u1xr1Vjcg7wc5ts
-