diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e34bce2..306bb7c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
-* @hashicorp/consul-core
+* @hashicorp/consul-selfmanage-maintainers
 
 # release configuration
-/.release/                              @hashicorp/release-engineering
-/.github/workflows/build.yml            @hashicorp/release-engineering
+/.release/                              @hashicorp/team-selfmanaged-releng
+/.github/workflows/build.yml            @hashicorp/team-selfmanaged-releng