diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a0f3eab..3838193e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,21 +6,21 @@ test:
   tags:
     - aave-build-runner
   before_script:
-    - docker-compose -f docker-compose.test.yml build
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml build
   script:
-    - docker-compose -f docker-compose.test.yml run contracts-env npm run ci:test
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml run contracts-env npm run ci:test
   after_script:
-    - docker-compose -f docker-compose.test.yml run contracts-env npm run ci:clean
-    - docker-compose -f docker-compose.test.yml down
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml run contracts-env npm run ci:clean
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml down
 
 deploy-mainnet-fork:
-  stage: checks
   tags:
     - aave-build-runner
+  stage: checks
   before_script:
-    - docker-compose -f docker-compose.test.yml build
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml build
   script:
-    - docker-compose -f docker-compose.test.yml run contracts-env npm run aave:fork:main
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml run contracts-env npm run aave:fork:main
   after_script:
-    - docker-compose -f docker-compose.test.yml run contracts-env npm run ci:clean
-    - docker-compose -f docker-compose.test.yml down
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml run contracts-env npm run ci:clean
+    - docker-compose -p ${CI_JOB_ID} -f docker-compose.test.yml down