diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
index b99d089..e7a2efb 100644
--- a/.github/workflows/deploy_test.yml
+++ b/.github/workflows/deploy_test.yml
@@ -22,6 +22,9 @@ jobs:
           export-variables: true
           keys-case: bypass
 
+      - name: Tear down previous staging containers (if any)
+        run: docker compose -f docker-compose.stag.yml down || true
+
       - name: Set up test containers
         run: docker compose -f docker-compose.stag.yml up --build -d
 
@@ -31,6 +34,9 @@ jobs:
       - name: Tear down test containers
         run: docker compose -f docker-compose.stag.yml down
 
+      - name: Tear down previous production containers (if any)
+        run: docker compose -f $COMPOSE_FILE down || true
+
       - name: Build and run docker image
         run: docker compose -f $COMPOSE_FILE up --force-recreate --build -d