diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml
index 9cd5b41..19322d6 100644
--- a/.forgejo/workflows/build-deploy.yml
+++ b/.forgejo/workflows/build-deploy.yml
@@ -79,6 +79,19 @@ jobs:
             docker push ${{ env.REGISTRY_MIRROR }}/${{ env.IMAGE }}:latest
           fi
 
+      - name: Cleanup build artifacts
+        if: always()
+        run: |
+          TAG="${{ steps.vars.outputs.tag }}"
+          docker rmi "${{ env.REGISTRY }}/${{ env.IMAGE }}:${TAG}" 2>/dev/null || true
+          docker rmi "${{ env.REGISTRY_MIRROR }}/${{ env.IMAGE }}:${TAG}" 2>/dev/null || true
+          if [ "${GITHUB_REF_NAME}" = "main" ]; then
+            docker rmi "${{ env.REGISTRY }}/${{ env.IMAGE }}:latest" 2>/dev/null || true
+            docker rmi "${{ env.REGISTRY_MIRROR }}/${{ env.IMAGE }}:latest" 2>/dev/null || true
+          fi
+          docker image prune -f 2>/dev/null || true
+          docker builder prune -f --keep-storage=4GB 2>/dev/null || true
+
   deploy:
     runs-on: ubuntu-latest
     needs: build
@@ -123,7 +136,12 @@ jobs:
             "$DEPLOY_IMAGE"
 
           docker ps --filter name="$CONTAINER_NAME"
-          docker image prune -f || true
+
+      - name: Cleanup old images
+        if: always()
+        run: |
+          docker image prune -f 2>/dev/null || true
+          docker builder prune -f --keep-storage=4GB 2>/dev/null || true
 
   bump-version:
     runs-on: ubuntu-latest