diff --git a/packages/kbn-relocate/README.md b/packages/kbn-relocate/README.md
index 3ceb2432c69d1..899a5e9b97970 100644
--- a/packages/kbn-relocate/README.md
+++ b/packages/kbn-relocate/README.md
@@ -10,12 +10,6 @@ You must have `gh` CLI tool installed. You can install it by running:
 brew install gh
 ```
 
-You must also configure your "default" kibana repo in `gh`, so that it can find PRs.:
-
-```sh
-gh repo set-default elastic/kibana
-```
-
 You must have `elastic/kibana` remote configured under the name `upstream`.
 
 You must have a remote named `origin` pointing to your fork of the Kibana repo.
diff --git a/packages/kbn-relocate/constants.ts b/packages/kbn-relocate/constants.ts
index 0ba7e9d50314b..059c32004370e 100644
--- a/packages/kbn-relocate/constants.ts
+++ b/packages/kbn-relocate/constants.ts
@@ -96,4 +96,6 @@ This PR aims at relocating some of the Kibana modules (plugins and packages) int
 > * Try to obtain the missing reviews / approvals before applying manual fixes, and/or keep your changes in a .patch / git stash.
 > * Please use [#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E) Slack channel for feedback.
 
+Are you trying to rebase this PR to solve merge conflicts? Please follow the steps describe [here](https://elastic.slack.com/archives/C07TCKTA22E/p1734019532879269?thread_ts=1734019339.935419&cid=C07TCKTA22E).
+
 `;
diff --git a/packages/kbn-relocate/relocate.ts b/packages/kbn-relocate/relocate.ts
index 646a3ba5bef0e..dde0c83fc096e 100644
--- a/packages/kbn-relocate/relocate.ts
+++ b/packages/kbn-relocate/relocate.ts
@@ -73,7 +73,7 @@ const relocateModules = async (toMove: Package[], log: ToolingLog): Promise<numb
 
     // single commit per module now
     await safeExec(`git add .`);
-    await safeExec(`git commit -m "Relocating module \\\`${module.id}\\\`"`);
+    await safeExec(`git commit --no-verify -m "Relocating module \\\`${module.id}\\\`"`);
     ++relocated;
   }
   return relocated;
diff --git a/packages/kbn-relocate/utils.git.ts b/packages/kbn-relocate/utils.git.ts
index 743e6522c585b..4f002772528fd 100644
--- a/packages/kbn-relocate/utils.git.ts
+++ b/packages/kbn-relocate/utils.git.ts
@@ -21,7 +21,9 @@ export function hasManualCommits(commits: Commit[]) {
     (commit) =>
       !commit.messageHeadline.startsWith('Relocating module ') &&
       !commit.messageHeadline.startsWith('Moving modules owned by ') &&
-      commit.authors.some((author) => author.login !== 'kibanamachine')
+      commit.authors.some(
+        (author) => author.login !== 'kibanamachine' && author.login !== 'elasticmachine'
+      )
   );
 
   return manualCommits.length > 0;
diff --git a/packages/kbn-relocate/utils.relocate.ts b/packages/kbn-relocate/utils.relocate.ts
index c76c1f48790ba..15121fefd344a 100644
--- a/packages/kbn-relocate/utils.relocate.ts
+++ b/packages/kbn-relocate/utils.relocate.ts
@@ -119,6 +119,7 @@ const replaceReferencesInternal = async (
   );
 
   const matchingFiles = result.stdout.split('\n').filter(Boolean);
+  matchingFiles.push('.github/CODEOWNERS'); // to update references in the manual section, thanks pgayvallet!
 
   for (let i = 0; i < matchingFiles.length; ++i) {
     const file = matchingFiles[i];