diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66f84fb0..91e5322d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,11 +19,6 @@ jobs:
         with:
           channel: 'stable'
 
-      - name: Write versioncode to pubspec.yml
-        run: |
-            export VERSION=$(printf '%(%Y%m%d)T\n' -1)
-            sed -i -E -e "s/\+[0-9]+/\+$VERSION/g" pubspec.yaml
-
       - name: Build full changelog
         id: changelog
         uses: TriPSs/conventional-changelog-action@v3
@@ -42,6 +37,11 @@ jobs:
           skip-version-file: 'false'
           skip-commit: 'false'
 
+      - name: Write versioncode to pubspec.yml
+        run: |
+          export VERSION=$(printf '%(%Y%m%d)T\n' -1)
+          sed -i -E -e "/version:/ s/$/\+$VERSION/" pubspec.yaml
+
       - name: Write changelog to fastlane
         if: ${{ steps.changelog.outputs.skipped == 'false' }}
         env:
@@ -55,7 +55,7 @@ jobs:
           author_name: Bastian Block
           author_email: blockbasti99@gmail.com
           message: 'chore: write changelog to fastlane'
-          add: 'fastlane/metadata/android/en-US/changelogs/*.txt'
+          add: "['fastlane/metadata/android/en-US/changelogs/*.txt', 'pubspec.yaml']"
 
       - name: Build APKs
         if: ${{ steps.changelog.outputs.skipped == 'false' }}