diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd8b939a4b..b5ca6a9ebe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -76,7 +76,7 @@ jobs:
         run: |
           cmake --build build --target package
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: |
           startsWith(github.ref, 'refs/tags/')
             && matrix.compiler == 'gcc'
@@ -170,7 +170,7 @@ jobs:
         run: |
           cmake --build build --target package
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
@@ -283,7 +283,7 @@ jobs:
             "staging/"
           shasum -a 256 Freeciv21-${{steps.split.outputs.fragment}}.dmg > Freeciv21-${{steps.split.outputs.fragment}}.dmg.sha256
       - name: Upload package
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a52b5e384a..e07c9dee1a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -50,6 +50,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - # Make sure there are no unstaged changes
+        # Was reporting changes to eol=crlf files in .gitattributes
+        run: git checkout -- .
       - run: git rev-parse --short=5 HEAD > cmake/AutoRevision.txt
       - run: git describe --tags `git rev-list --tags --max-count=1` >> cmake/AutoRevision.txt
       - run: cat cmake/AutoRevision.txt