diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 774a0e7..df4164e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,12 +13,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             artifact_name: astra
             asset_name: astra-linux-amd64
 
     name: release ${{ matrix.os }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     environment: production
 
     env:
@@ -39,9 +39,6 @@ jobs:
             ./target/
           key: ${{ env.cache-key }}
 
-      - name: Build Server
-        run: cargo build --release
-
       - name: Clear cache
         continue-on-error: true # Don't fail if the cache doesn't exist
         env:
@@ -50,6 +47,9 @@ jobs:
           gh extension install actions/gh-actions-cache
           gh actions-cache delete "${{ env.cache-key }}" --confirm
 
+      - name: Build Server
+        run: cargo build --release
+
       - name: Upload server binary to release
         uses: svenstaro/upload-release-action@v2
         with:
diff --git a/Makefile b/Makefile
index cbb026d..13adea3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,4 @@ pack_lua:
 
 # use this syntax: just release_tag="0.0.0" range="start..end" update-changelog
 update-changelog:
-    @git cliff --unreleased --prepend CHANGELOG.md
\ No newline at end of file
+    @git cliff --unreleased --tag="$(TAG)" --prepend CHANGELOG.md
\ No newline at end of file