diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index 9def719..e868209 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -32,6 +32,10 @@ jobs:
       docker:
         image: docker:27.0.3-dind
     steps:
+      - name: Stop the dangling builder container
+        if: always()
+        run: docker rm -f $BUILDER_CONTAINER_NAME || true
+
       - name: Setup the build environment
         run: |
           export BUILDER_PRIVATE_KEY=$(echo -ne "$BUILDER_PRIVATE_KEY" | awk '{printf "%s\\n", $0}')