diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b8b3d9f..41a9966 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - supuni-dev
 
 env:
   EC2_HOST: ${{ secrets.EC2_HOST }}
diff --git a/api-gateway/index.js b/api-gateway/index.js
index 92aca38..603a143 100644
--- a/api-gateway/index.js
+++ b/api-gateway/index.js
@@ -3,17 +3,20 @@ 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.options('*', cors());
+
 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(cors({
-    origin: 'https://blendrush.netlify.app',
-    methods: ['GET', 'POST', 'PUT', 'DELETE'],
-    credentials: true
-}));
 
 // app.use('/api/menu', createProxyMiddleware({ target: 'http://localhost:3001', changeOrigin: true }));
 // app.use('/api/orders', createProxyMiddleware({ target: 'http://localhost:3002', changeOrigin: true }));
diff --git a/api-gateway/node_modules/.package-lock.json b/api-gateway/node_modules/.package-lock.json
index a905468..2306c69 100644
--- a/api-gateway/node_modules/.package-lock.json
+++ b/api-gateway/node_modules/.package-lock.json
@@ -251,6 +251,19 @@
         "node": ">=6.6.0"
       }
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -851,6 +864,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
diff --git a/api-gateway/package-lock.json b/api-gateway/package-lock.json
index 8ba2ea8..ae9b056 100644
--- a/api-gateway/package-lock.json
+++ b/api-gateway/package-lock.json
@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "body": "^5.1.0",
+        "cors": "^2.8.5",
         "express": "^5.1.0",
         "http-proxy-middleware": "^3.0.5",
         "nodemon": "^3.1.10",
@@ -263,6 +264,19 @@
         "node": ">=6.6.0"
       }
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -877,6 +891,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -1510,6 +1533,15 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
       "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -1900,6 +1932,11 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
     "object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
diff --git a/api-gateway/package.json b/api-gateway/package.json
index 600a69f..404a254 100644
--- a/api-gateway/package.json
+++ b/api-gateway/package.json
@@ -11,6 +11,7 @@
   "description": "",
   "dependencies": {
     "body": "^5.1.0",
+    "cors": "^2.8.5",
     "express": "^5.1.0",
     "http-proxy-middleware": "^3.0.5",
     "nodemon": "^3.1.10",
diff --git a/user-service/package-lock.json b/user-service/package-lock.json
index 2722126..6ecb1a2 100644
--- a/user-service/package-lock.json
+++ b/user-service/package-lock.json
@@ -23,7 +23,6 @@
         "jsonwebtoken": "^9.0.2",
         "mongoose": "^8.15.1",
         "mongoose-sequence": "^6.0.1",
-        "nodemailer": "^7.0.6",
         "nodemon": "^3.1.10",
         "npm": "^10.9.2",
         "passport": "^0.7.0",
@@ -1277,15 +1276,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/nodemailer": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.6.tgz",
-      "integrity": "sha512-F44uVzgwo49xboqbFgBGkRaiMgtoBrBEWCVincJPK9+S9Adkzt/wXCLKbf7dxucmxfTI5gHGB+bEmdyzN6QKjw==",
-      "license": "MIT-0",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/nodemon": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz",
@@ -4416,4 +4406,4 @@
       "license": "ISC"
     }
   }
-}
+}
\ No newline at end of file