diff --git a/.github/workflows/onpush_builder.yaml b/.github/workflows/onpush_builder.yaml
index 872ecd54e..28fea6cf4 100644
--- a/.github/workflows/onpush_builder.yaml
+++ b/.github/workflows/onpush_builder.yaml
@@ -72,55 +72,6 @@ jobs:
         with: 
           path: "./${{ matrix.addon }}"
 
-  make-changelog:
-    if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
-    needs: [check-addon-changes, make-executable]
-    runs-on: ubuntu-latest
-    strategy: 
-      fail-fast: false 
-      matrix: 
-        addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} 
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Update changelog for minor versions
-        run: |
-          echo "Starting"
-          cd "$path"
-          # Get version
-          if [ -f config.yaml ]; then
-            version="$(sed -e '/version/!d' -e 's/.*version: //' config.yaml)"
-          elif [ -f config.json ]; then
-            version="$(sed -e '/version/!d' -e 's/.*[^"]*"\([^"]*\)"/\1/' config.json)"
-            version="${version//,}"
-          else
-            exit 1
-          fi
-          # Exit if test
-          if [[ "$version" == *"test"* ]]; then exit 0; fi
-          # Create changelog
-          touch CHANGELOG.md
-          # If the version does not exist
-          if ! grep -q "$version" CHANGELOG.md; then
-            # And if latest wasn't a minor version
-            #if [ "$(sed -n '/^###/p;q' CHANGELOG.md)" ]; then 
-            #  sed -i "1d" CHANGELOG.md
-            #  sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md
-            #else
-            sed -i "1i\- Minor bugs fixed" CHANGELOG.md
-            sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md
-            #fi
-          fi
-        env: 
-          path: "./${{ matrix.addon }}"
-      - name: Commit if needed
-        uses: EndBug/add-and-commit@v9
-        with:
-          commit: -u
-          message: "GitHub bot : changelog"
-          default_author: github_actions
-
-
   build:
     if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
     needs: [check-addon-changes, make-executable, lint_config]
@@ -183,3 +134,51 @@ jobs:
             --image "${{ steps.check.outputs.image }}" \
             --docker-hub "ghcr.io/${{ github.repository_owner }}" \
             --addon
+
+  make-changelog:
+    if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
+    needs: build
+    runs-on: ubuntu-latest
+    strategy: 
+      fail-fast: false 
+      matrix: 
+        addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} 
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Update changelog for minor versions
+        run: |
+          echo "Starting"
+          cd "$path"
+          # Get version
+          if [ -f config.yaml ]; then
+            version="$(sed -e '/version/!d' -e 's/.*version: //' config.yaml)"
+          elif [ -f config.json ]; then
+            version="$(sed -e '/version/!d' -e 's/.*[^"]*"\([^"]*\)"/\1/' config.json)"
+            version="${version//,}"
+          else
+            exit 1
+          fi
+          # Exit if test
+          if [[ "$version" == *"test"* ]]; then exit 0; fi
+          # Create changelog
+          touch CHANGELOG.md
+          # If the version does not exist
+          if ! grep -q "$version" CHANGELOG.md; then
+            # And if latest wasn't a minor version
+            #if [ "$(sed -n '/^###/p;q' CHANGELOG.md)" ]; then 
+            #  sed -i "1d" CHANGELOG.md
+            #  sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md
+            #else
+            sed -i "1i\- Minor bugs fixed" CHANGELOG.md
+            sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md
+            #fi
+          fi
+        env: 
+          path: "./${{ matrix.addon }}"
+      - name: Commit if needed
+        uses: EndBug/add-and-commit@v9
+        with:
+          commit: -u
+          message: "GitHub bot : changelog"
+          default_author: github_actions