diff --git a/scripts/create-github-release.js b/scripts/create-github-release.js
index 6150b5f4bd..f25c6838fb 100755
--- a/scripts/create-github-release.js
+++ b/scripts/create-github-release.js
@@ -142,7 +142,8 @@ async function getReleaseDescriptionFromCommitMessage(commitMessage) {
   // Use the PR description to prepare for the release description
   const isChangesetRelease = commitMessage.includes(CHANGESET_RELEASE_BRANCH);
   if (isChangesetRelease) {
-    return data.body.split('\n').slice(3).join('\n');
+    const lines = data.body.split('\n');
+    return lines.slice(lines.indexOf('# Releases') + 1).join('\n');
   }
 
   return data.body;
@@ -182,7 +183,6 @@ async function main() {
   const releaseDescription = await getReleaseDescriptionFromCommitMessage(
     commitMessage,
   );
-
   await createRelease(releaseDescription);
 }
 
diff --git a/scripts/create-release-tag.js b/scripts/create-release-tag.js
index 297898ef97..042b00866a 100755
--- a/scripts/create-release-tag.js
+++ b/scripts/create-release-tag.js
@@ -18,6 +18,7 @@
 
 const { Octokit } = require('@octokit/rest');
 const path = require('path');
+const fs = require('fs-extra');
 
 const baseOptions = {
   owner: 'backstage',