diff --git a/CODEOWNERS b/CODEOWNERS
index ceb327d73ba978898e44164250f0eb70daf18565..9ba7cd712d44952bf980b9ab2f007678d41e75bc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -10,12 +10,13 @@
 /hack/                 @runyontr @joshwolf @megamind @phillip.record
 /scripts/              @runyontr @joshwolf @megamind @phillip.record
 /tests/                @runyontr @joshwolf @megamind @phillip.record
+/docs/                 @runyontr @joshwolf @megamind @phillip.record
 
 
 [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 approveer.
-/docs/                @michaelmcleroy @egoode @aaronbeger @aaron.ruse @branden.cobb @shouseba @chadningle @chuck.laverde @daryndecker @dyoung @egnoriega @egoode @iahmad @jcookehg   
+/docs/                @michaelmcleroy @egoode @aaronbeger @aaron.ruse @branden.cobb @shouseba @chuck.laverde @daryndecker @dyoung @egnoriega @egoode @iahmad @jcookehg   
                       @jasonkrause @jpower_rfed @jkayse @jdale @joshwolf @karchaf @kavitha @kenna81 @kevin.wilder @killian.byrne @mgauto @msbrown47 @mdutton @matthew.kaiser 
                       @michaelmcleroy @nick_tetrate @racosta @rkernick @runyontr @ryan.j.garcia @sean.deprefontaine @seanthomaswilliams1 @thomas.burton @Ozzie100 @tsiddique1 
                       @toladipupo @visuth.dy @zdzielinski @micah.nagel @LynnStill @cmcgrath
@@ -46,6 +47,11 @@ chart/values.yaml               @kenna81 @kavitha @cmcgrath @nick_tetrate
 chart/templates/authservice     @kenna81 @kavitha @cmcgrath 
 chart/templates/istio           @kenna81 @kavitha @cmcgrath @nick_tetrate
 
+# ^[HAProxy]
+# chart/Chart.yaml              @?
+# chart/values.yaml             @?
+# chart/templates/haproxy       @?
+
 ^[Anchore]
 chart/Chart.yaml                @blake.hearn @micah.nagel @jasonkrause
 chart/values.yaml               @blake.hearn @micah.nagel @jasonkrause
@@ -77,19 +83,37 @@ chart/values.yaml               @lynnstill @ryan.j.garcia
 chart/templates/monitoring      @lynnstill @ryan.j.garcia
 
 ^[Twistlock]
-chart/Chart.yaml                @thomas.burton
-chart/values.yaml               @thomas.burton
-chart/templates/twistlock       @thomas.burton
+chart/Chart.yaml                @thomas.burton @ryan.j.garcia @runyontr @joshwolf
+chart/values.yaml               @thomas.burton @ryan.j.garcia @runyontr @joshwolf
+chart/templates/twistlock       @thomas.burton @ryan.j.garcia @runyontr @joshwolf
+
+^[Sonarqube]
+chart/Chart.yaml                @kevin.wilder @lynnstill @branden.cobb
+chart/values.yaml               @kevin.wilder @lynnstill @branden.cobb
+chart/templates/sonarqube       @kevin.wilder @lynnstill @branden.cobb
 
-^[Gitlab]
-chart/Chart.yaml                @egoode @kevin.wilder
-chart/values.yaml               @egoode @kevin.wilder
-chart/templates/gitlab          @egoode @kevin.wilder
+^[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                @megamind
 chart/values.yaml               @megamind
 chart/templates/keycloak        @megamind
 
+^[Mattermost (and operator)]
+chart/Chart.yaml                @micah.nagel @branden.cobb
+chart/values.yaml               @micah.nagel @branden.cobb
+chart/templates/mattermost      @micah.nagel @branden.cobb
+
+^[Minio (and operator)]
+chart/Chart.yaml                @LynnStill @kevin.wilder @branden.cobb
+chart/values.yaml               @LynnStill @kevin.wilder @branden.cobb
+chart/templates/minio           @LynnStill @kevin.wilder @branden.cobb
 
+^[Velero]
+chart/Chart.yaml                @tunde @adam.toy
+chart/values.yaml               @tunde @adam.toy
+chart/templates/velero          @tunde @adam.toy