diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2980005..b9aacc4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,7 +91,7 @@ build-browser-client:
   script:
     - export $(cat context.env | xargs)
 
-    - docker build browser-domain -f browser-domain/Dockerfile.prod -t ${BROWSER_CLIENT_PROD_IMAGE_NAME}
+    - docker build browser-domain -f browser-domain/Dockerfile.prod --build-arg "REACT_APP_ENDPOINT=https://api.fids.slc.ar/" -t ${BROWSER_CLIENT_PROD_IMAGE_NAME}
     - docker build browser-domain -f browser-domain/Dockerfile.test -t ${BROWSER_CLIENT_TEST_IMAGE_NAME}
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
@@ -109,7 +109,7 @@ build-screen-client:
   script:
     - export $(cat context.env | xargs)
 
-    - docker build screen-domain -f screen-domain/Dockerfile.prod -t ${SCREEN_CLIENT_PROD_IMAGE_NAME}
+    - docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ENDPOINT=https://api.fids.slc.ar/" --build-arg "REACT_APP_ORIGIN=Frankfurt" -t ${SCREEN_CLIENT_PROD_IMAGE_NAME}
     - docker build screen-domain -f screen-domain/Dockerfile.test -t ${SCREEN_CLIENT_TEST_IMAGE_NAME}
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
diff --git a/browser-domain/docker-compose.yml b/browser-domain/docker-compose.yml
index b93ff25..2d28688 100644
--- a/browser-domain/docker-compose.yml
+++ b/browser-domain/docker-compose.yml
@@ -5,8 +5,6 @@ services:
     container_name: fids_browser_client
     image: ${CLIENT_IMAGE}
     restart: always
-    ports:
-      - 8080:80
     environment:
       - API_HOST=api
     network_mode: host
diff --git a/browser-domain/src/Api.ts b/browser-domain/src/Api.ts
index 548b4ab..9e6424d 100644
--- a/browser-domain/src/Api.ts
+++ b/browser-domain/src/Api.ts
@@ -2,7 +2,7 @@ import { Axios, AxiosError } from "axios";
 import { Credentials, Token, User, Flight, FlightCreate } from "./Types";
 
 const instance = new Axios({
-	baseURL: "http://127.0.0.1:5002/",
+	baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5000/",
 	headers: {
 		accept: "application/json",
 		"Content-Type": "application/json",
diff --git a/flights-domain/flights-information/src/api/main.py b/flights-domain/flights-information/src/api/main.py
index 3b8e1cd..8223df8 100644
--- a/flights-domain/flights-information/src/api/main.py
+++ b/flights-domain/flights-information/src/api/main.py
@@ -12,6 +12,7 @@ app.include_router(health.router, prefix="/health")
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
+        "https://fids.slc.ar",
         "https://fids.slc.ar",
         "http://localhost:8080",
         "http://localhost:8081",
diff --git a/run.sh b/run.sh
index 151e62a..6913deb 100755
--- a/run.sh
+++ b/run.sh
@@ -92,7 +92,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
             fi
             ;;
         'screen')
-            docker build screen-domain -f screen-domain/Dockerfile.prod -t $USER/screen-client:prod
+            docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ORIGIN=$REACT_APP_ORIGIN" -t $USER/screen-client:prod
             export CLIENT_IMAGE=$USER/screen-client:prod
             docker compose -f screen-domain/docker-compose.yml up -d
             ;;
@@ -122,7 +122,7 @@ else
     docker build $FLIGHTS_INFORMATION -f $FLIGHTS_INFORMATION/Dockerfile.prod -t $USER/flights-information:prod
     docker build gateway -f gateway/Dockerfile.prod -t $USER/gateway:prod
 
-    docker build screen-domain -f screen-domain/Dockerfile.prod -t $USER/screen-client:prod
+    docker build screen-domain -f screen-domain/Dockerfile.prod --build-arg "REACT_APP_ORIGIN=$REACT_APP_ORIGIN" -t $USER/screen-client:prod
     docker build browser-domain -f browser-domain/Dockerfile.prod -t $USER/browser-client:prod
 
     export API_IMAGE=$USER/flights-information:prod
diff --git a/screen-domain/Dockerfile.prod b/screen-domain/Dockerfile.prod
index 1f9c13e..8bf6e5a 100644
--- a/screen-domain/Dockerfile.prod
+++ b/screen-domain/Dockerfile.prod
@@ -7,6 +7,8 @@ COPY . .
 
 ARG REACT_APP_ENDPOINT
 ENV REACT_APP_ENDPOINT $REACT_APP_ENDPOINT
+ARG REACT_APP_ORIGIN
+ENV REACT_APP_ORIGIN $REACT_APP_ORIGIN
 
 RUN npm run build
 
diff --git a/screen-domain/Dockerfile.test b/screen-domain/Dockerfile.test
index 775d2c1..e48b0f1 100644
--- a/screen-domain/Dockerfile.test
+++ b/screen-domain/Dockerfile.test
@@ -1,5 +1,4 @@
 FROM node:17.9.1 AS app
-ENV REACT_APP_ENDPOINT "http://127.0.0.1:5000/"
 WORKDIR /app
 COPY package.json .
 COPY package-lock.json .
diff --git a/screen-domain/docker-compose.yml b/screen-domain/docker-compose.yml
index 0a5a763..a0ff045 100644
--- a/screen-domain/docker-compose.yml
+++ b/screen-domain/docker-compose.yml
@@ -5,8 +5,6 @@ services:
     container_name: fids_screens_client
     image: ${CLIENT_IMAGE}
     restart: always
-    ports:
-      - 8080:80
     environment:
       - API_HOST=api
     network_mode: host
diff --git a/screen-domain/src/Api.ts b/screen-domain/src/Api.ts
index 2705e35..1454d22 100644
--- a/screen-domain/src/Api.ts
+++ b/screen-domain/src/Api.ts
@@ -2,7 +2,7 @@ import { Axios, AxiosError } from "axios";
 import { Credentials, User, Flight } from "./Types";
 
 const instance = new Axios({
-	baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5002/",
+	baseURL: process.env.REACT_APP_ENDPOINT ? process.env.REACT_APP_ENDPOINT : "http://127.0.0.1:5000/",
 	headers: {
 		accept: "application/json",
 		"Content-Type": "application/json",