diff --git a/.gitea/actions/docker-build/action.yml b/.gitea/actions/docker-build/action.yml
index 7e55749..a4d8809 100644
--- a/.gitea/actions/docker-build/action.yml
+++ b/.gitea/actions/docker-build/action.yml
@@ -76,18 +76,23 @@ runs:
         docker buildx version
 
         # Try docker-container driver first (for multi-platform), fall back to docker driver
+        BUILDER_SETUP=false
         if docker buildx create \
           --name gitea-builder \
           --driver docker-container \
           --driver-opt image=moby/buildkit:buildx-stable-1 \
           --driver-opt network=host \
-          --use 2>/dev/null; then
-          docker buildx inspect --bootstrap && exit 0
+          --use 2>&1; then
+          if docker buildx inspect --bootstrap 2>&1; then
+            BUILDER_SETUP=true
+          fi
         fi
 
-        # Fallback: use docker driver (works on all runners, single-platform only)
-        docker buildx create --name gitea-builder --driver docker --use 2>/dev/null || docker buildx use gitea-builder
-        docker buildx inspect --bootstrap
+        if [ "$BUILDER_SETUP" != "true" ]; then
+          docker buildx rm -f gitea-builder 2>/dev/null || true
+          docker buildx create --name gitea-builder --driver docker --use
+          docker buildx inspect --bootstrap
+        fi
 
     - name: Compute metadata
       id: meta