diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b537a3..3e50918 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,6 @@ build-auth-api:
     - export FOLDER=auth-domain/user-manager
     - export PROD_IMAGE=${USER_MANAGER_PROD_IMAGE_NAME}
     - export TEST_IMAGE=${USER_MANAGER_TEST_IMAGE_NAME}
-    - export BUILD_ARG_TEST="BASE_IMAGE=$USER_MANAGER_PROD_IMAGE_NAME"
     - *build-and-push-script
 
 build-flights-api:
@@ -86,7 +85,6 @@ build-flights-api:
     - export FOLDER=flights-domain/flights-information
     - export PROD_IMAGE=${FLIGHTS_INFO_PROD_IMAGE_NAME}
     - export TEST_IMAGE=${FLIGHTS_INFO_TEST_IMAGE_NAME}
-    - export BUILD_ARG_TEST="BASE_IMAGE=$FLIGHTS_INFO_PROD_IMAGE_NAME"
     - *build-and-push-script
 
 build-browser-client:
@@ -117,7 +115,6 @@ build-subscription-api:
     - export FOLDER=subscription-domain/subscription-manager
     - export PROD_IMAGE=${SUBSCRIPTION_PROD_IMAGE_NAME}
     - export TEST_IMAGE=${SUBSCRIPTION_TEST_IMAGE_NAME}
-    - export BUILD_ARG_TEST="BASE_IMAGE=$SUBSCRIPTION_PROD_IMAGE_NAME"
     - *build-and-push-script
 
 build-gateway:
@@ -127,7 +124,6 @@ build-gateway:
     - export FOLDER=gateway
     - export PROD_IMAGE=${GATEWAY_PROD_IMAGE_NAME}
     - export TEST_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
-    - export BUILD_ARG_TEST="BASE_IMAGE=$GATEWAY_PROD_IMAGE_NAME"
     - *build-and-push-script
 
 .test-script: &test-script
@@ -285,8 +281,8 @@ test-screen-client:
   - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE down
   - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE pull
   - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE up -d
-  - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE exec usermanager-api python manage.py recreate_db
-  - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE exec usermanager-api python manage.py seed_db
+  - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE exec usermanager-api-dev python manage.py recreate_db
+  - docker compose -f auth-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE exec usermanager-api-dev python manage.py seed_db
   - export API_IMAGE=$SUBSCRIPTION_TEST_IMAGE_NAME
   - docker compose -f subscription-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE down
   - docker compose -f subscription-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE pull