diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 25b00f97ac..e58bd32eb0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @supabase/dev-workflows
+* @supabase/cli
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50427e0078..d32a2c6e3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: CI
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - develop
@@ -89,7 +90,7 @@ jobs:
 
   link:
     name: Link
-    if: ${{ !github.event.pull_request.head.repo.fork }}
+    if: ${{ github.event_name == 'merge_group' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ac4a90d5ac..2421a2a7fe 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,6 +13,7 @@ name: "CodeQL"
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - develop