diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cee2f4ed..0b33a84a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: MPL-2.0
 
 
-@hashicorp/consul-ecs
+* @hashicorp/consul-selfmanage-maintainers
 
-/.github/workflows/* @hashicorp/release-engineering @hashicorp/consul-ecs
+/.github/workflows/* @hashicorp/team-selfmanaged-releng @hashicorp/consul-selfmanage-maintainers