diff --git a/CODEOWNERS b/CODEOWNERS
index 3e1a77cd83577a14165d98038610e5f0347a0b96..5f9fcb2b7383fdba289879339c6265be7f7eb047 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,136 +1,9 @@
-[Project Managers]
-# protect individual files in the root directory such as the CODEOWNERS file
-/*                              @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-# Recursive protection for directories
-/.gitlab-ci/                    @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/.gitlab/                       @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/base/                          @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/chart/                         @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/charter/                       @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/scripts/                       @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/tests/                         @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
-/docs/                          @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb @joshwolf
+[Project Maintainers]
+*                              @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb
 
 
 [Docs Owners]
 # Allow any one of the listed codeowners to approve merges to the documentation 
 # Does not allow the creator of the merge request to be the approver.
-/docs/                          @brandencobb @cmcgrath @echuang @evan.rush @jasonkrause @joshwolf @kenna81 @kevin.wilder @LynnStill @micah.nagel @michaelmartin @michaelmcleroy @rkernick @runyontr @ryan.j.garcia @shouseba @toladipupo @tsiddique1 @ronwebb @ryan.thompson.44 @gabe
+/docs/                         @brandencobb @cmcgrath @echuang @evan.rush @jasonkrause @kenna81 @kevin.wilder @LynnStill @micah.nagel @michaelmartin @michaelmcleroy @runyontr @ryan.j.garcia @toladipupo @ronwebb @ryan.thompson.44 @gabe @razzle @lucas.rodriguez 
 
-################################################
-# The following entries are for optional approval. 
-# They are only included to document contacts and have no impact on approval requirements
-################################################
-
-^[Kustomize Base Owners]
-base/                           @michaelmcleroy @micah.nagel @ryan.j.garcia @brandencobb
-
-^[CI Owners]
-.gitlab-ci/                     @toladipupo @brandencobb @evan.rush
-tests/                          @toladipupo @brandencobb @evan.rush
-
-^[Hack Owners]
-scripts/                        @toladipupo @michaelmcleroy 
-^[Charter Owners]
-charter/                        @gabe @micah.nagel @michaelmcleroy @ryan.thompson.44 @runyontr @ryan.j.garcia @brandencobb
-
-^[Istio, Istio Operator, and Authservice]
-chart/Chart.yaml                @joshwolf @michaelmcleroy @micah.nagel @runyontr @ryan.j.garcia @stas
-chart/values.yaml               @joshwolf @michaelmcleroy @micah.nagel @runyontr @ryan.j.garcia @stas
-chart/templates/authservice     @joshwolf @michaelmcleroy @micah.nagel @runyontr @ryan.j.garcia @stas
-chart/templates/istio           @joshwolf @michaelmcleroy @micah.nagel @runyontr @ryan.j.garcia @stas
-
-^[HAProxy]
-chart/Chart.yaml              @blloyd @runyontr @ryan.j.garcia
-chart/values.yaml             @blloyd @runyontr @ryan.j.garcia
-chart/templates/haproxy       @blloyd @runyontr @ryan.j.garcia
-
-^[Anchore]
-chart/Chart.yaml                @trkdashin @micah.nagel @jasonkrause
-chart/values.yaml               @trkdashin @micah.nagel @jasonkrause
-chart/templates/anchore         @trkdashin @micah.nagel @jasonkrause
-
-^[ArgoCD]
-chart/Chart.yaml                @matthew.kaiser @brandencobb @evan.rush
-chart/values.yaml               @matthew.kaiser @brandencobb @evan.rush
-chart/templates/argocd          @matthew.kaiser @brandencobb @evan.rush
-
-^[Cluster Auditor]              @echuang @toladipupo @michaelmcleroy
-chart/Chart.yaml                @echuang @toladipupo @michaelmcleroy
-chart/values.yaml               @echuang @toladipupo @michaelmcleroy
-chart/templates/clusterauditor  @echuang @toladipupo @michaelmcleroy
-
-^[Gatekeeper]
-chart/Chart.yaml                @echuang @toladipupo @michaelmcleroy
-chart/values.yaml               @echuang @toladipupo @michaelmcleroy   
-chart/templates/gatekeeper      @echuang @toladipupo @michaelmcleroy
-
-^[Jaeger]
-chart/Chart.yaml                @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia
-chart/values.yaml               @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia  
-chart/templates/jaegar          @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia
-
-^[Monitoring]
-chart/Chart.yaml                @lynnstill @ryan.j.garcia @michaelmartin
-chart/values.yaml               @lynnstill @ryan.j.garcia @michaelmartin
-chart/templates/monitoring      @lynnstill @ryan.j.garcia @michaelmartin
-
-^[Twistlock]
-chart/Chart.yaml                @thomas.burton @ryan.j.garcia @runyontr @micah.nagel
-chart/values.yaml               @thomas.burton @ryan.j.garcia @runyontr @micah.nagel
-chart/templates/twistlock       @thomas.burton @ryan.j.garcia @runyontr @micah.nagel
-
-^[Sonarqube]
-chart/Chart.yaml                @kevin.wilder @lynnstill @brandencobb
-chart/values.yaml               @kevin.wilder @lynnstill @brandencobb
-chart/templates/sonarqube       @kevin.wilder @lynnstill @brandencobb
-
-^[Gitlab and Gitlab Runners]
-chart/Chart.yaml                @lynnstill @ryan.j.garcia @kevin.wilder
-chart/values.yaml               @lynnstill @ryan.j.garcia @kevin.wilder
-chart/templates/gitlab          @lynnstill @ryan.j.garcia @kevin.wilder
-
-^[KeyCloak]
-chart/Chart.yaml                @kevin.wilder @michaelmcleroy @zacw
-chart/values.yaml               @kevin.wilder @michaelmcleroy @zacw
-chart/templates/keycloak        @kevin.wilder @michaelmcleroy @zacw
-
-^[Kiali]
-chart/Chart.yaml                @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia
-chart/values.yaml               @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia
-chart/templates/kiali           @runyontr @joshwolf @michaelmcleroy @micah.nagel @ryan.j.garcia
-
-^[Mattermost (and operator)]
-chart/Chart.yaml                @micah.nagel @brandencobb @jasonkrause
-chart/values.yaml               @micah.nagel @brandencobb @jasonkrause
-chart/templates/mattermost      @micah.nagel @brandencobb @jasonkrause
-
-^[Minio (and operator)]
-chart/Chart.yaml                @LynnStill @kevin.wilder @brandencobb
-chart/values.yaml               @LynnStill @kevin.wilder @brandencobb
-chart/templates/minio           @LynnStill @kevin.wilder @brandencobb
-
-^[Nexus]
-chart/Chart.yaml                @kevin.wilder @ariel.shnitzer @grant.duncklee
-chart/values.yaml               @kevin.wilder @ariel.shnitzer @grant.duncklee
-chart/templates/nexus           @kevin.wilder @ariel.shnitzer @grant.duncklee
-
-^[Velero]
-chart/Chart.yaml                @tunde @adam.toy @micah.nagel @toladipupo
-chart/values.yaml               @tunde @adam.toy @micah.nagel @toladipupo
-chart/templates/velero          @tunde @adam.toy @micah.nagel @toladipupo
-
-^[fluentbit]
-chart/Chart.yaml                @ryan.j.garcia @echuang
-chart/values.yaml               @ryan.j.garcia @echuang
-chart/templates/fluentbit       @ryan.j.garcia @echuang
-
-^[eck-operator]
-chart/Chart.yaml                @ryan.j.garcia @evan.rush @toladipupo
-chart/values.yaml               @ryan.j.garcia @evan.rush @toladipupo
-chart/templates/eck-operator    @ryan.j.garcia @evan.rush @toladipupo
-
-^[elasticsearch-kibana]
-chart/Chart.yaml                        @ryan.j.garcia @evan.rush @ronwebb
-chart/values.yaml                       @ryan.j.garcia @evan.rush @ronwebb
-chart/templates/elasticsearch-kibana    @ryan.j.garcia @evan.rush @ronwebb