diff --git a/.gitea/workflows/build_publish-artifact.yml b/.gitea/workflows/build_publish-artifact.yml
index 1f5abc3..88c7e7e 100644
--- a/.gitea/workflows/build_publish-artifact.yml
+++ b/.gitea/workflows/build_publish-artifact.yml
@@ -259,6 +259,11 @@ jobs:
           source /tmp/build-ctx/build.env
           bash scripts/report-status.sh failure "Docker push $NEXT_VERSION FAILED" ci-docker-push
 
+      - name: Clean up Docker image artifact
+        if: steps.gatekeeper.outputs.skip == 'false'
+        run: |
+          rm -f /tmp/image/artifact.tar
+
   tag-commit:
     runs-on: ubuntu-latest
     needs: [check, push]
@@ -327,30 +332,3 @@ jobs:
           source /tmp/build-ctx/build.env
           bash scripts/report-status.sh failure "Tag $NEXT_VERSION FAILED" ci-docker-tag
 
-  cleanup:
-    runs-on: ubuntu-latest
-    needs: [tag-commit]
-    if: always()
-    steps:
-      - name: Delete build artifacts
-        run: |
-          echo "Siivotaan artifactit..."
-          RUN_ID="${{ github.run_id }}"
-          REPO="${{ github.repository }}"
-          SERVER="${{ gitea.server_url }}"
-
-          # List artifacts for this run
-          ARTIFACTS=$(curl -s \
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-            "${SERVER}/api/v1/repos/${REPO}/actions/runs/${RUN_ID}/artifacts")
-
-          echo "Artifacts: $(echo "$ARTIFACTS" | jq -r '.artifacts | length') kpl"
-
-          # Delete each by name
-          echo "$ARTIFACTS" | jq -r '.artifacts[] | .name' | while IFS= read -r name; do
-            echo "Deleting: $name"
-            curl -s -X DELETE \
-              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              "${SERVER}/api/v1/repos/${REPO}/actions/runs/${RUN_ID}/artifacts/${name}"
-            echo " -> deleted $name"
-          done