diff --git a/.gitignore b/.gitignore
index e741f19..6d2bd58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .venv
 .env
 .env.*
+!.env.dev.example
+!.env.prod.example
 node_modules
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9930d7b..b268e88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,11 +123,12 @@ test-auth-api:
   script:
     - export $(cat context.env | xargs)
 
-    - export API_IMAGE=$BROWSER_CLIENT_TEST_IMAGE_NAME
+    - export API_IMAGE=$USER_MANAGER_TEST_IMAGE_NAME
     - export CLIENT_IMAGE=dummy-image
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
 
+    - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
     - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
     - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit --renew-anon-volumes
     - docker cp fids_usermanager_api:/usr/src/app/coverage.xml .
@@ -156,6 +157,7 @@ test-flights-api:
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
 
+    - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
     - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
     - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit --renew-anon-volumes
     - docker cp fids_flights_api:/usr/src/app/coverage.xml .
@@ -180,18 +182,58 @@ test-integration:
     - export $(cat context.env | xargs)
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
 
-    - export API_IMAGE=$API_TEST_IMAGE_NAME
-    - export CLIENT_IMAGE=$CLIENT_TEST_IMAGE_NAME
+    - export API_IMAGE=$FLIGHTS_INFO_TEST_IMAGE_NAME
     - export TEST_TARGET=INTEGRATION 
-    # - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE pull
-    # - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
+    - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
+    - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
+    - docker compose -f flights-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
+
+    - export API_IMAGE=$USER_MANAGER_TEST_IMAGE_NAME
+    - export TEST_TARGET=INTEGRATION 
+    - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
+    - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
+    - docker compose -f auth-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
   needs:
     - job: test-flights-api
     - job: test-auth-api
+    - job: preparation
+      artifacts: true
+
+test-browser-integration:
+  stage: test
+  tags:
+    - dev
+  script:
+    - export $(cat context.env | xargs)
+    - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
+
+    - export CLIENT_IMAGE=$BROWSER_CLIENT_TEST_IMAGE_NAME
+    - docker compose -f browser-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
+    - docker compose -f browser-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
+    - docker compose -f browser-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
+  needs:
+    - job: test-integration
     - job: build-browser-client
+    - job: preparation
+      artifacts: true
+
+test-screen-integration:
+  stage: test
+  tags:
+    - dev
+  script:
+    - export $(cat context.env | xargs)
+    - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
+
+    - export CLIENT_IMAGE=$SCREEN_CLIENT_TEST_IMAGE_NAME
+    - docker compose -f screen-domain/docker-compose.yml --env-file $ENV_DEV_FILE down
+    - docker compose -f screen-domain/docker-compose.yml --env-file $ENV_DEV_FILE pull
+    - docker compose -f screen-domain/docker-compose.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
+  needs:
+    - job: test-integration
     - job: build-screen-client
     - job: preparation
-      artifacts: true  
+      artifacts: true
 
 deliver-dockerhub:
   stage: deliver
@@ -213,7 +255,8 @@ deliver-dockerhub:
     - docker push $DOCKER_HUB_BROWSER_CLIENT_IMAGE
     - docker push $DOCKER_HUB_SCREEN_CLIENT_IMAGE
   needs:
-    - job: test-integration
+    - job: test-screen-integration
+    - job: test-browser-integration
     - job: preparation
       artifacts: true  
 
diff --git a/auth-domain/.env.dev.example b/auth-domain/.env.dev.example
new file mode 100644
index 0000000..abd888b
--- /dev/null
+++ b/auth-domain/.env.dev.example
@@ -0,0 +1,4 @@
+POSTGRES_USER=user
+POSTGRES_PASS=password
+POSTGRES_DB=api_dev
+APP_SETTINGS=src.config.DevelopmentConfig
\ No newline at end of file
diff --git a/auth-domain/.env.prod.example b/auth-domain/.env.prod.example
new file mode 100644
index 0000000..27670b4
--- /dev/null
+++ b/auth-domain/.env.prod.example
@@ -0,0 +1,4 @@
+POSTGRES_USER=user
+POSTGRES_PASS=password
+POSTGRES_DB=api_prod
+APP_SETTINGS=src.config.ProductionConfig
\ No newline at end of file
diff --git a/auth-domain/user-manager/Dockerfile.test b/auth-domain/user-manager/Dockerfile.test
index e00bed0..c1fb2e6 100644
--- a/auth-domain/user-manager/Dockerfile.test
+++ b/auth-domain/user-manager/Dockerfile.test
@@ -4,7 +4,7 @@ FROM ${BASE_IMAGE}
 
 ENV FLASK_DEBUG=1
 ENV FLASK_ENV=development
-ENV DATABASE_TEST_URL=postgresql://postgres:postgres@api-db:5432/api_test
+ENV DATABASE_TEST_URL=postgresql://postgres:postgres@usermanager-db:5432/api_test
 
 # add and install requirements
 COPY --chown=python:python ./requirements.test.txt .
diff --git a/flights-domain/.env.dev.example b/flights-domain/.env.dev.example
new file mode 100644
index 0000000..abd888b
--- /dev/null
+++ b/flights-domain/.env.dev.example
@@ -0,0 +1,4 @@
+POSTGRES_USER=user
+POSTGRES_PASS=password
+POSTGRES_DB=api_dev
+APP_SETTINGS=src.config.DevelopmentConfig
\ No newline at end of file
diff --git a/flights-domain/.env.prod.example b/flights-domain/.env.prod.example
new file mode 100644
index 0000000..27670b4
--- /dev/null
+++ b/flights-domain/.env.prod.example
@@ -0,0 +1,4 @@
+POSTGRES_USER=user
+POSTGRES_PASS=password
+POSTGRES_DB=api_prod
+APP_SETTINGS=src.config.ProductionConfig
\ No newline at end of file
diff --git a/screen-domain/src/Api.ts b/screen-domain/src/Api.ts
index 8ef6ab7..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,
+	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",