diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 02184a563485..4ed06090c3ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,21 +25,6 @@
 # Arrow Format
 # /format/
 
-## Components
-/c_glib/ @kou
-# /cpp/
-/cpp/src/arrow/acero @westonpace
-/cpp/src/arrow/adapters/orc @wgtmac
-/cpp/src/arrow/engine @westonpace
-/cpp/src/arrow/flight/ @lidavidm
-/cpp/src/parquet @wgtmac
-/matlab/ @kevingurney @kou @sgilmore10
-/python/ @AlenkaF @raulcd @rok
-/python/pyarrow/_flight.pyx @lidavidm
-/python/pyarrow/**/*gandiva* @wjones127
-/r/ @jonkeane @thisisnic
-/ruby/ @kou
-
 # Docs
 # /docs/
 # *.md
@@ -53,16 +38,41 @@
 .pre-commit-config.yaml @raulcd
 # .git*
 
-# release scripts, archery etc.
+# Release scripts, archery etc.
 /ci/ @assignUser @jonkeane @kou @raulcd
 /dev/ @assignUser @jonkeane @kou @raulcd
 .dockerignore @raulcd
 .env @assignUser @jonkeane @kou @raulcd
 compose.yaml @assignUser @jonkeane @kou @raulcd
 
-# R specific packaging tooling
+# Components
+
+## C GLib
+/c_glib/ @kou
+
+## C++
+/cpp/src/arrow/acero @westonpace
+/cpp/src/arrow/adapters/orc @wgtmac
+/cpp/src/arrow/engine @westonpace
+/cpp/src/arrow/flight/ @lidavidm
+/cpp/src/parquet @wgtmac
+
+## MATLAB
+/.github/workflows/matlab.yml @kevingurney @sgilmore10
+/matlab/ @kevingurney @kou @sgilmore10
+
+## Python
+/python/ @AlenkaF @raulcd @rok
+/python/pyarrow/_flight.pyx @lidavidm
+/python/pyarrow/**/*gandiva* @wjones127
+
+## R
+/r/ @jonkeane @thisisnic
 /r/configure* @assignUser
 /r/Makefile @assignUser
 /r/PACKAGING.md @assignUser
 /r/tools/ @assignUser
 /r/.Rbuildignore @assignUser
+
+## Ruby
+/ruby/ @kou