diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8f35ccb7829cb503e5e0190b6b5c9de42b2f9a7..753c31eb7896f62e7e9721200741886ecc2661ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@
     TANK_HOST: tank
     TANK_PORT: 8040
     TANK_ORIGIN: http://$TANK_HOST:$TANK_PORT
+    TANK_CALLBACK_BASE_URL: $TANK_ORIGIN
     TANK_OIDC_CLIENT_ID: 123456
     TANK_OIDC_CLIENT_SECRET: tank-oidc-secret
     TANK_POSTGRES_DB: tank
@@ -74,9 +75,7 @@
           SITE_URL = "$STEERING_ORIGIN"
           DEBUG = True
           EOF
-          ./run.sh init-db
-          poetry run ./manage.py loaddata fixtures/*/*.json
-          poetry run gunicorn --bind "0.0.0.0:$STEERING_PORT" --workers $(nproc) steering.wsgi
+          make initialize run.prod
     - name: autoradio/tank:unstable
       alias: tank
       entrypoint: ['/bin/bash']
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index e06454fda3cd504c16d6c703ca4a56c22027e537..b345b7b06a64aa64402c743db259af3dccd43067 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -23,9 +23,7 @@ services:
         DEBUG = True
         SITE_URL = "$STEERING_ORIGIN"
         EOF
-        ./run.sh init-db
-        poetry run ./manage.py loaddata fixtures/*/*.json
-        poetry run gunicorn --bind "0.0.0.0:$STEERING_PORT" --workers $(nproc) steering.wsgi
+        make initialize run.prod
 
   tank:
     image: autoradio/tank:unstable
diff --git a/tests/env b/tests/env
index 317c70fbc139cff77da977ce03b535f99e2d4932..b2297739a00a4fc02ca4e64c09a4ad241ed103c7 100644
--- a/tests/env
+++ b/tests/env
@@ -13,6 +13,7 @@ STEERING_ORIGIN=http://$STEERING_HOST:$STEERING_PORT
 TANK_HOST=tank
 TANK_PORT=8040
 TANK_ORIGIN=http://$TANK_HOST:$TANK_PORT
+TANK_CALLBACK_BASE_URL=$TANK_ORIGIN
 TANK_OIDC_CLIENT_ID=123456
 TANK_OIDC_CLIENT_SECRET=tank-oidc-secret
 TANK_POSTGRES_DB=tank