From f7a7693827bfb53d0419dee193939b2827885ade Mon Sep 17 00:00:00 2001
From: Andrei <16517508+anvacaru@users.noreply.github.com>
Date: Thu, 10 Sep 2026 13:10:14 +0300
Subject: [PATCH 1/2] force remove any existing containers with the target name

---
 .github/actions/with-docker/action.yml | 2 ++
 .github/workflows/test-pr.yml          | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml
index 4964ae42bb..8f71387f4c 100644
--- a/.github/actions/with-docker/action.yml
+++ b/.github/actions/with-docker/action.yml
@@ -48,6 +48,8 @@ runs:
         --build-arg LLVM_VERSION="${LLVM_VERSION}"  \
         --build-arg UV_VERSION="${UV_VERSION}"
 
+      docker rm -f "${CONTAINER_NAME}" || true
+
       docker run                            \
         --name "${CONTAINER_NAME}"          \
         --rm                                \
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index 941030fb7f..cd7dced8e8 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -107,9 +107,7 @@ jobs:
       - name: 'Tear down Docker'
         if: always()
         run: |
-          # Best effort: the container does not exist if 'Set up Docker' failed, and a
-          # non-zero exit here would mask the step that actually failed.
-          docker stop --timeout=0 kevm-ci-concrete-${{ github.sha }} || true
+          docker rm -f kevm-ci-concrete-${{ github.sha }} || true
 
   test-prove:
     name: 'Proofs: ${{ matrix.name }}'
@@ -170,9 +168,7 @@ jobs:
       - name: 'Tear down Docker'
         if: always()
         run: |
-          # Best effort: the container does not exist if 'Set up Docker' failed, and a
-          # non-zero exit here would mask the step that actually failed.
-          docker stop --timeout=0 kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} || true
+          docker rm -f kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} || true
 
   nix:
     name: 'Nix'

From e0f211dad88eecbb8af23e5771233a3572734cfb Mon Sep 17 00:00:00 2001
From: Andrei <16517508+anvacaru@users.noreply.github.com>
Date: Wed, 23 Sep 2026 10:16:22 +0300
Subject: [PATCH 2/2] restore comments on tear-down steps

---
 .github/workflows/test-pr.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index cd7dced8e8..e04b741cab 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -107,6 +107,8 @@ jobs:
       - name: 'Tear down Docker'
         if: always()
         run: |
+          # Best effort: the container does not exist if 'Set up Docker' failed, and a
+          # non-zero exit here would mask the step that actually failed.
           docker rm -f kevm-ci-concrete-${{ github.sha }} || true
 
   test-prove:
@@ -168,6 +170,8 @@ jobs:
       - name: 'Tear down Docker'
         if: always()
         run: |
+          # Best effort: the container does not exist if 'Set up Docker' failed, and a
+          # non-zero exit here would mask the step that actually failed.
           docker rm -f kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} || true
 
   nix: