diff --git a/nextstep-backend/.env.template b/nextstep-backend/.env.template
index c325bb8..0c16a46 100644
--- a/nextstep-backend/.env.template
+++ b/nextstep-backend/.env.template
@@ -5,7 +5,7 @@ DB_CONNECTION=<DB_CONNECTION>
 ACCESS_TOKEN_SECRET=<ACCESS_TOKEN_SECRET>
 TOKEN_EXPIRATION=<TOKEN_EXPIRATION>
 REFRESH_TOKEN_EXPIRATION=<REFRESH_TOKEN_EXPIRATION>
-FRONTEND_URL=<FRONTEND_URL>
+FRONTEND_URL=<FRONTEND_URL;FRONTEND_URL>
 BACKEND_URL=<BACKEND_URL>
 FIREBASE_SERVICE_ACCOUNT={"type": "service_account","project_id": <id>,"private_key_id": <id>,"private_key": <key>,"client_email": <email>,"client_id": <clientId>,"auth_uri": "https://accounts.google.com/o/oauth2/auth","token_uri": "https://oauth2.googleapis.com/token","auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs","client_x509_cert_url": <>,"universe_domain": "googleapis.com"}
 OPENROUTER_API_KEY=<OPENROUTER_API_KEY>
diff --git a/nextstep-backend/src/app.ts b/nextstep-backend/src/app.ts
index 30aef16..c512095 100644
--- a/nextstep-backend/src/app.ts
+++ b/nextstep-backend/src/app.ts
@@ -24,7 +24,7 @@ const specs = swaggerJsdoc(options);
 const app = express();
 
 const corsOptions = {
-    origin: [config.app.frontend_url(), config.app.backend_url()],
+    origin: [...(config.app.frontend_url().split(";")), config.app.backend_url()],
     methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
     credentials: true, // Allow cookies to be sent with requests
 };
diff --git a/nextstep-frontend/.env.template b/nextstep-frontend/.env.template
index 59afee2..9c4a6b4 100644
--- a/nextstep-frontend/.env.template
+++ b/nextstep-frontend/.env.template
@@ -1,7 +1,7 @@
 ## This is an extra file
 
 VITE_PORT=<VITE_PORT>
-VITE_BACKEND_URL=<VITE_BACKEND_URL>
+VITE_BACKEND_URL=<VITE_BACKEND_URL;VITE_BACKEND_URL>
 VITE_DOMAIN_NAME=<VITE_DOMAIN_NAME>
 VITE_ALLOWED_HOSTS=<demo1.example.com;demo2.example.com;demo3.example.com>
 VITE_REACT_APP_FIREBASE_API_KEY=<VITE_REACT_APP_FIREBASE_API_KEY>
diff --git a/nextstep-frontend/src/config.ts b/nextstep-frontend/src/config.ts
index 60f2279..1fb922e 100644
--- a/nextstep-frontend/src/config.ts
+++ b/nextstep-frontend/src/config.ts
@@ -1,6 +1,7 @@
 export const config = {
     app: {
-        backend_url: () => import.meta.env.VITE_BACKEND_URL || 'http://localhost:3000',
+        backend_url: () => import.meta.env.VITE_BACKEND_URL.split(";")
+            .filter((backendUrl: string) => backendUrl.includes(window.location.protocol))[0],
     },
     socketMethods: {
         messageFromServer: "message-from-server",