diff --git a/.github/workflows/main-process-update.yml b/.github/workflows/main-process-update.yml
index 47b3424f3b..ee0dd51ff7 100644
--- a/.github/workflows/main-process-update.yml
+++ b/.github/workflows/main-process-update.yml
@@ -183,7 +183,7 @@ jobs:
         if: ${{ !cancelled() && steps.bdk.outcome == 'success' }}
         run: |
           yarn
-          yarn install        
+          yarn install
           ../scripts/wait_for_first_block.sh
         env:
           RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }}
@@ -271,6 +271,11 @@ jobs:
         env:
           RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }}
 
+      - name: Remove all containers
+        if: always()                   # run this step always
+        run: |
+          docker ps -aq | xargs docker rm -f
+
       - name: Remove builder cache
         if: always()                   # run this step always
         run: |