diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2adf6e60003d..33b055817079 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,13 +39,6 @@ jobs:
           echo "::set-output name=build_number::${BUTTERFLY_BUILD_NUMBER}"
           git config --global user.email "ci@linwood.dev"
           git config --global user.name "Linwood CI"
-      - name: Create changelog
-        run: |
-          dart pub get -C tools
-          dart run tools/set_version.dart --build-number keep --changelog
-          git add .
-          git commit -m "Create changelog for ${{ env.BUTTERFLY_VERSION }}"
-          git push origin
       - name: Create tag
         run: |
           BUTTERFLY_VERSION="${{ env.BUTTERFLY_VERSION }}"
@@ -177,6 +170,13 @@ jobs:
           echo "BUTTERFLY_BUILD_NUMBER=${BUTTERFLY_BUILD_NUMBER}" >> $GITHUB_ENV
           git config --global user.email "ci@linwood.dev"
           git config --global user.name "Linwood CI"
+      - name: Create changelog
+        run: |
+          dart pub get -C tools
+          dart run tools/set_version.dart --build-number keep --changelog
+          git add .
+          git commit -m "Create changelog for ${{ env.BUTTERFLY_VERSION }}"
+          git push origin
       - name: Merge main
         run: |
           git fetch
@@ -284,4 +284,4 @@ jobs:
   #      run: fastlane deploy
   #      if: ${{ !github.event.inputs.stable }}
   #      env:
-  #        PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
+  #        PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt
index a093e5363af2..9b227e440f61 100644
--- a/fastlane/metadata/android/en-US/changelogs/25.txt
+++ b/fastlane/metadata/android/en-US/changelogs/25.txt
@@ -13,4 +13,4 @@
     * Fix offset of eraser mask
 * Fix loading of templates in old version
 * Add reset button in templates
-* Ignore invalid templates
\ No newline at end of file
+* Ignore invalid templates ([#183](https://github.com/LinwoodCloud/Butterfly/issues/183))
\ No newline at end of file