diff --git a/.gitea/workflows/docker-build-multiarch.yml b/.gitea/workflows/docker-build-multiarch.yml
index 0708399..596565c 100644
--- a/.gitea/workflows/docker-build-multiarch.yml
+++ b/.gitea/workflows/docker-build-multiarch.yml
@@ -50,4 +50,21 @@ jobs:
          
       - name: Inspect pushed manifest
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
\ No newline at end of file
+          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG_NAME }}
+          
+      - name: Cleanup Buildx (builder, container, volume, cache)
+        if: always()
+        run: |
+          set -euxo pipefail
+          # Remove the builder (stops its BuildKit container)
+          if docker buildx version >/dev/null 2>&1; then
+            docker buildx rm multi || true
+          fi
+          # Belt-and-suspenders: kill any lingering buildkit container
+          docker rm -f $(docker ps -a --filter name='buildx_buildkit_multi' -q) 2>/dev/null || true
+          # Remove the builder's state volume(s)
+          docker volume rm $(docker volume ls -q | grep '^buildx_buildkit_multi') 2>/dev/null || true
+          # (Optional) prune caches to reclaim disk
+          if docker buildx version >/dev/null 2>&1; then
+            docker buildx prune --all --force || true
+          fi          
\ No newline at end of file