diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cee61272a8..1a39e24ec4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,3 @@
 # All pull requests need to be reviewed by someone from GitHub.
-# @github/linguist is a GitHub maintained team.
 #
-*     @github/linguist
+*     @github-linguist/github
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8309a1bf2f..59b2233cf4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - master
+  merge_group:
 
 permissions:
   contents: read
diff --git a/github-linguist.gemspec b/github-linguist.gemspec
index 0e50c0f400..7cb167b579 100644
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.description = 'We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.'
 
   s.authors  = "GitHub"
-  s.homepage = "https://github.com/github/linguist"
+  s.homepage = "https://github.com/github-linguist/linguist"
   s.license  = "MIT"
   s.metadata = {
-    "github_repo" => "ssh://github.com/github/linguist"
+    "github_repo" => "ssh://github.com/github-linguist/linguist"
   }
 
   s.files = Dir['{lib,ext}/**/*', 'grammars/*', 'LICENSE'] - Dir['lib/linguist/linguist.{so,bundle}']