diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index fb49a00..c04209c 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       IMAGE_NAME: ${{ gitea.repository }}
       IMAGE_TAG: ${{ gitea.sha }}
     steps:
-      - name: Checkout repository
+      - name: "Checkout repository"
         uses: actions/checkout@v4
 
       - name: "Generate Dockerfile"
@@ -32,7 +32,7 @@ jobs:
           sed -i "s|IMAGE_NAME|$REGISTRY/$IMAGE_NAME:$IMAGE_TAG|g" k8s.yml
           cat k8s.yml
 
-      - name: Create buildkitd.toml
+      - name: "Create buildkitd.toml"
         run: |
           cat <<EOF > buildkitd.toml
           [registry."registry.staging:5000"]
@@ -40,7 +40,7 @@ jobs:
             insecure = true
           EOF
 
-      - name: Set up Buildx builder
+      - name: "Set up Buildx builder"
         run: |
           BUILDER_NAME="builder-$(date +%s)"
           echo "BUILDER_NAME=$BUILDER_NAME" >> $GITEA_ENV
@@ -58,7 +58,11 @@ jobs:
       - name: "Build & Push Docker"
         run: |
           docker buildx build \
-            --builder BUILDER_NAME  \
+            --builder $BUILDER_NAME  \
             -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG \
             --push .
+
+      - name: "Cleanup builder"
+        if: always()
+        run: docker buildx rm $BUILDER_NAME || true
           
\ No newline at end of file