diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 192b60a..9d3ebf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,9 @@ preparation:
 
     - echo "DOCKER_HUB_API_IMAGE=$DOCKER_HUB_USER/foodtruckers-api:${BUILD_ID}"         >> context.env
     - echo "DOCKER_HUB_CLIENT_IMAGE=$DOCKER_HUB_USER/foodtruckers-client:${BUILD_ID}"   >> context.env
+
+    - echo "ENV_DEV_FILE=$(echo ENV_DEV)"     >> context.env
+    - echo "ENV_PROD_FILE=$(echo ENV_PROD)"   >> context.env
   artifacts: 
     paths: 
       - context.env
@@ -78,8 +81,8 @@ test-api:
 
     - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
 
-    - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile api pull
-    - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile api up --abort-on-container-exit
+    - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE --profile api pull
+    - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE --profile api up --abort-on-container-exit
     - docker cp foodtruckers_api:/usr/src/app/coverage.xml .
     - docker cp foodtruckers_api:/usr/src/app/report.xml .
   artifacts:
@@ -105,8 +108,8 @@ test-integration:
     - export API_IMAGE=$API_TEST_IMAGE_NAME
     - export CLIENT_IMAGE=$CLIENT_TEST_IMAGE_NAME
     - export TEST_TARGET=INTEGRATION 
-    - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile all pull
-    - docker compose -f docker-compose.yml --env-file $ENV_DEV --profile all up --abort-on-container-exit
+    - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE --profile all pull
+    - docker compose -f docker-compose.yml --env-file $ENV_DEV_FILE --profile all up --abort-on-container-exit
   needs:
     - job: test-api
     - job: build-client
@@ -145,10 +148,10 @@ deploy-prod:
 
     - docker login -u $DOCKER_HUB_USER --password $DOCKER_HUB_PASS
 
-    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD stop
-    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD rm
-    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD pull
-    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD up -d
+    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD_FILE stop
+    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD_FILE rm
+    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD_FILE pull
+    - docker compose -f docker-compose.yml --profile all --env-file $ENV_PROD_FILE up -d
   needs:
     - job: deliver-dockerhub
     - job: preparation