diff --git a/scripts/ci/codegen/pushGeneratedCode.ts b/scripts/ci/codegen/pushGeneratedCode.ts
index 6daff2b8fbf..369b596b851 100644
--- a/scripts/ci/codegen/pushGeneratedCode.ts
+++ b/scripts/ci/codegen/pushGeneratedCode.ts
@@ -53,24 +53,22 @@ export async function pushGeneratedCode(): Promise<void> {
     return;
   }
 
-  const skipCi = isMainBranch ? '[skip ci]' : '';
-  let message = await run(`git show -s ${baseBranch} --format="%s ${text.commitEndMessage} ${skipCi}"`);
-  const authors = await run(
-    `git show -s ${baseBranch} --format="
-Co-authored-by: %an <%ae>
-%(trailers:key=Co-authored-by)"`,
-  );
-
-  if (IS_RELEASE_COMMIT && isMainBranch) {
+  let baseMessage = `%s ${text.commitEndMessage}`;
+  if (IS_RELEASE_COMMIT || isMainBranch) {
     console.log('Processing release commit');
-    message = `${text.commitReleaseMessage} [skip ci]`;
+    baseMessage = `${text.commitReleaseMessage} [skip ci]`;
   }
 
-  message += authors;
+  const commitMessage = await run(
+    `git show -s ${baseBranch} --format="${baseMessage}
+
+Co-authored-by: %an <%ae>
+%(trailers:key=Co-authored-by)"`,
+  );
 
   console.log(`Pushing code to generated branch: '${branchToPush}'`);
   await run('git add .');
-  await run(`git commit -m "${message.replaceAll('"', '\\"')}"`);
+  await run(`git commit -m "${commitMessage.replaceAll('"', '\\"')}"`);
   await run(`git push origin ${branchToPush}`);
 
   setOutput('GENERATED_COMMIT', await run('git rev-parse HEAD'));