diff --git a/.github/CODEOWNERS-manual b/.github/CODEOWNERS-manual
index 5a5d7f3351..e69de29bb2 100644
--- a/.github/CODEOWNERS-manual
+++ b/.github/CODEOWNERS-manual
@@ -1 +0,0 @@
-* mfc@autoware.org ryohsuke.mitsudome@tier4.jp yutaka.kondo@tier4.jp
diff --git a/.github/sync-files.yaml b/.github/sync-files.yaml
index ddc94fa9f8..e25c02698b 100644
--- a/.github/sync-files.yaml
+++ b/.github/sync-files.yaml
@@ -27,6 +27,8 @@
         sd "        with:\n" "        with:\n          local-cspell-json: .cspell.json\n" {source}
     - source: .github/workflows/sync-files.yaml
     - source: .github/workflows/update-codeowners-from-packages.yaml
+      pre-commands: |
+        sd "          auto-merge-method: squash\n" "          auto-merge-method: squash\n          global-codeowners: @autowarefoundation/autoware-core-global-codeowners" {source}
     - source: .clang-format
     - source: .clang-tidy
     - source: .markdown-link-check.json