diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index c5d763e..0944349 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -170,6 +170,9 @@ jobs:
           fetch-depth: 0 # Important for changelog
           filter: blob:none # We don't need all blobs
 
+      # required for proper changelogs
+      - run: git checkout -b "${GITHUB_REF_NAME}"
+
       - uses: ./.forgejo/actions/setup
       - uses: ./.forgejo/actions/setup-node
 
diff --git a/tools/changelog.mjs b/tools/changelog.mjs
index 7bcf61c..7071e18 100644
--- a/tools/changelog.mjs
+++ b/tools/changelog.mjs
@@ -5,4 +5,4 @@ const file = process.argv[3]
   ? fs.createWriteStream(process.argv[3])
   : process.stdout;
 
-getChangelog().pipe(file);
+getChangelog(process.argv[2], !!process.argv[2]).pipe(file);
diff --git a/tools/forgejo-release.js b/tools/forgejo-release.js
index c67c2b8..fe0f9bc 100644
--- a/tools/forgejo-release.js
+++ b/tools/forgejo-release.js
@@ -68,7 +68,7 @@ class GiteaReleaseCommand extends Command {
       return 1;
     }
 
-    const stream = getChangelog(undefined, false).setEncoding('utf8');
+    const stream = getChangelog(tag, true).setEncoding('utf8');
     const changes = (await stream.toArray()).join('');
 
     this.context.stdout.write(`Creating release ${tag}.\n`);