diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..43b776a8
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @beam-community/team
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 710946fa..2487615a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,10 +2,14 @@ name: Continuous Integration
 
 on:
   pull_request:
-    types: [opened, reopened, synchronize]
+    types:
+      - opened
+      - reopened
+      - synchronize
   push:
     branches:
-      - 'master'
+      - master
+  merge_group:
 
 jobs:
   test: