diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66bb59f7ec1322671cfe70feb003a4c37095ae84..61c2d040e59ca471a800818e8916ace71de24bbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ test-default-deployment:
   script:
     - "make teardown"
     - "rm -f .env"
-    - "docker compose up -d || docker compose down"
+    - "docker compose up -d && make teardown"
     - "make teardown"
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
@@ -140,7 +140,7 @@ test-env-deployment:
   script:
     - "make teardown"
     - "cp .env.unix.example .env"
-    - "docker compose up -d || docker compose down"
+    - "docker compose up -d && make teardown"
     - "make teardown"
 
 scan-analyse-service: