diff --git a/.env b/.env
index a3e2a1e..36ec0a7 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@ NODE_LOCAL_PORT=6868
 NODE_DOCKER_PORT=8080
 
 CLIENT_ORIGIN=http://127.0.0.1:8888
-CLIENT_API_BASE_URL=http://127.0.0.1:6868/api
+CLIENT_API_BASE_URL=https://bug-free-space-fiesta-jj9qrpjpg69hqwwp-6868.app.github.dev/api
 
 REACT_LOCAL_PORT=8888
 REACT_DOCKER_PORT=80
\ No newline at end of file
diff --git a/bezkoder-api/server.js b/bezkoder-api/server.js
index b0f27db..491560f 100644
--- a/bezkoder-api/server.js
+++ b/bezkoder-api/server.js
@@ -5,10 +5,10 @@ const cors = require("cors");
 const app = express();
 
 var corsOptions = {
-  origin: process.env.CLIENT_ORIGIN || "http://localhost:8081"
+  origin: process.env.CLIENT_ORIGIN || "https://bug-free-space-fiesta-jj9qrpjpg69hqwwp-8888.app.github.dev"
 };
 
-app.use(cors(corsOptions));
+app.use(cors());
 
 // parse requests of content-type - application/json
 app.use(express.json());
diff --git a/bezkoder-ui/src/http-common.js b/bezkoder-ui/src/http-common.js
index ecca813..c1a7959 100644
--- a/bezkoder-ui/src/http-common.js
+++ b/bezkoder-ui/src/http-common.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 
 export default axios.create({
-  baseURL: process.env.REACT_APP_API_BASE_URL || 'http://localhost:8080/api',
+  baseURL: process.env.REACT_APP_API_BASE_URL || 'https://bug-free-space-fiesta-jj9qrpjpg69hqwwp-6868.app.github.dev/api',
   headers: {
     "Content-type": "application/json"
   }