diff --git a/.cache/alpine-base.digest b/.cache/alpine-base.digest
deleted file mode 100644
index ba65e34..0000000
--- a/.cache/alpine-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-alpine@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62
diff --git a/.cache/basic-base.digest b/.cache/basic-base.digest
deleted file mode 100644
index 5412bfb..0000000
--- a/.cache/basic-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
diff --git a/.cache/debian-base.digest b/.cache/debian-base.digest
deleted file mode 100644
index 5412bfb..0000000
--- a/.cache/debian-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index dfe96c8..9204e5d 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -304,24 +304,32 @@ jobs:
         run: |
           git config user.name "${{ secrets.GIT_USERNAME }}"
           git config user.email "${{ secrets.GIT_EMAIL }}"
+
           if git status --porcelain | grep .; then
+            # Create a temporary branch
+            TEMP_BRANCH="tmp-buildinfo-$(date -u +%s)"
+            git checkout -b "$TEMP_BRANCH"
+
             git add */build-info.json
             git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
-            git push
 
-            for version in alpine debian basic; do
-              TAG="build-$version"
-              git tag -d "$TAG" 2>/dev/null || true
-              git tag "$TAG"
-              git push origin "$TAG" --force
-            done
+            # Push temporary branch
+            git push origin "$TEMP_BRANCH"
+
+            # Merge temporary branch into main safely
+            git checkout main
+            git fetch origin main
+            git merge --no-ff --no-edit "$TEMP_BRANCH"
+
+            # Push main branch
+            git push origin main
+
+            # Delete temporary branch remotely
+            git push origin --delete "$TEMP_BRANCH" || true
           else
             echo "[INFO] No build-info changes to commit."
           fi
 
-          ls -l basic/build-info.json || echo "❌ build-info not written"
-          cat basic/build-info.json || echo "❌ empty build-info"
-
   generate-changelogs:
     needs:
       - check-for-changes