diff --git a/.ng-dev/commit-message.mjs b/.ng-dev/commit-message.mjs
index 94fe91d8f727..4a3b270ce0a7 100644
--- a/.ng-dev/commit-message.mjs
+++ b/.ng-dev/commit-message.mjs
@@ -9,7 +9,6 @@ export const commitMessage = {
   maxLineLength: Infinity,
   minBodyLength: 0,
   minBodyLengthTypeExcludes: ['docs'],
-  disallowFixup: true,
   // Note: When changing this logic, also change the `contributing.ejs` file.
   scopes: packages.map(({ name }) => name),
 };
diff --git a/.ng-dev/pull-request.mjs b/.ng-dev/pull-request.mjs
index 8beefa10c5fd..1f2d84d7ccba 100644
--- a/.ng-dev/pull-request.mjs
+++ b/.ng-dev/pull-request.mjs
@@ -1,12 +1,12 @@
 /**
  * Configuration for the merge tool in `ng-dev`. This sets up the labels which
  * are respected by the merge script (e.g. the target labels).
- * 
+ *
  * @type { import("@angular/ng-dev").PullRequestConfig }
  */
 export const pullRequest = {
   githubApiMerge: {
-    default: 'rebase',
+    default: 'auto',
     labels: [{ pattern: 'merge: squash commits', method: 'squash' }],
   },
 };