diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9cf1dabeb4216f3246f447c7dd6a9bb9d9ddedd..2a3afbde5b6911e98cb9f20380d49f4211795f60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ default:
     - name: postgis/postgis:15-3.3
       alias: db_server
   variables:
-    ALLOWED_HOSTS: "127.0.0.1,hubapp"
+    ALLOWED_HOSTS: "127.0.0.1,hubapp,hubapp-${CI_JOB_ID}"
     DJANGO_DEBUG: "I_KNOW_WHAT_I_AM_DOING"
     POSTGRES_HOST_AUTH_METHOD: trust
     POSTGRES_PASSWORD: runner
@@ -331,12 +331,12 @@ build_test:
     SERVE_API: "no"
     SERVE_BACKOFFICE: "no"
     SERVE_FRONTEND: "no"
-    BASE_URL: http://hubapp:8000
+    BASE_URL: http://hubapp-${CI_JOB_ID}:8000
   services:
     - name: postgis/postgis:15-3.3
       alias: db_server
     - name: "$CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID-test"
-      alias: hubapp
+      alias: hubapp-${CI_JOB_ID}
       variables:
         DJANGO_CREATE_ADMIN_PASSWORD: "Test1234"
         DJANGO_DEBUG: "no"