diff --git a/scripts/ci/codegen/pushToRepository.ts b/scripts/ci/codegen/pushToRepository.ts
index 340f8aff2e1..f8ebe63a7ed 100644
--- a/scripts/ci/codegen/pushToRepository.ts
+++ b/scripts/ci/codegen/pushToRepository.ts
@@ -2,6 +2,7 @@ import fsp from 'fs/promises';
 import path, { resolve } from 'path';
 
 import {
+  CI,
   configureGitHubAuthor,
   ensureGitHubToken,
   exists,
@@ -158,8 +159,7 @@ async function pushToRepository(repository: string, config: RepositoryConfigurat
       head: task.prBranch,
     });
 
-    await run(`echo ${ensureGitHubToken()} | gh auth login --with-token`);
-    await run(`gh --repo ${OWNER}/${repository} pr merge ${data.number} --auto`);
+    await run(`gh --repo ${OWNER}/${repository} pr merge ${data.number} --squash --auto`);
 
     console.log(`Pull request created on ${OWNER}/${repository}`);
     console.log(`  > ${data.url}`);
@@ -170,6 +170,10 @@ if (import.meta.url.endsWith(process.argv[1])) {
   setVerbose(false);
   const repositories = process.argv.slice(2) as Array<string>;
 
+  if (CI) {
+    await run(`echo ${ensureGitHubToken()} | gh auth login --with-token`);
+  }
+
   await Promise.allSettled(
     Object.entries(pushToRepositoryConfiguration).map(([name, config]) => {
       if (repositories.length === 0 || repositories.includes(name)) {