diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f4d0b36c5bc8..4630d5abacc4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-# See https://github.com/scottrigby/prometheus-helm-charts/issues/12
+# See https://github.com/prometheus-community/helm-charts/issues/12
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
@@ -6,16 +6,14 @@
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @prometheus-community/helm-charts-admins
 
-/.github/workflows/ @prometheus-community/helm-charts-admins @jkroepke @GMartinez-Sisti
-/renovate.json @prometheus-community/helm-charts-admins @jkroepke @GMartinez-Sisti
+/.github/workflows/ @prometheus-community/helm-charts-admins @GMartinez-Sisti
+/renovate.json @prometheus-community/helm-charts-admins @GMartinez-Sisti
 
 /charts/alertmanager/ @monotek @naseemkullah
 /charts/alertmanager-snmp-notifier/ @maxwo
 /charts/jiralert/ @jkroepke @zanhsieh
 /charts/kube-prometheus-stack/ @andrewgkew @gianrubio @gkarthiks @GMartinez-Sisti @jkroepke @QuentinBisson @scottrigby @Xtigyro
 /charts/kube-state-metrics/ @dotdc @mrueg @tariq1890
-/charts/prom-label-proxy/ @jkroepke
-/charts/prometheus/ @gianrubio @naseemkullah @Xtigyro @zanhsieh @zeritti
 /charts/prometheus-adapter/ @hectorj2f @mattiasgees @steven-sheehy
 /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio @monotek @rsotnychenko
 /charts/prometheus-cloudwatch-exporter/ @asherf @gianrubio @torstenwalter
@@ -25,6 +23,7 @@
 /charts/prometheus-druid-exporter/ @iamabhishek-dubey @sandy724
 /charts/prometheus-elasticsearch-exporter/ @desaintmartin @svenmueller @zeritti
 /charts/prometheus-fastly-exporter/ @arslanbekov
+/charts/prometheus/ @gianrubio @naseemkullah @Xtigyro @zanhsieh @zeritti
 /charts/prometheus-ipmi-exporter/ @lexfrei
 /charts/prometheus-json-exporter/ @schmiddim @xiu @zanhsieh
 /charts/prometheus-kafka-exporter/ @gkarthiks @golgoth31 @zeritti
@@ -54,3 +53,4 @@
 /charts/prometheus-to-sd/ @acondrat
 /charts/prometheus-windows-exporter/ @jkroepke
 /charts/prometheus-yet-another-cloudwatch-exporter/ @cristiangreco @thomaspeitz
+/charts/prom-label-proxy/ @jkroepke
diff --git a/scripts/check-codeowners.sh b/scripts/check-codeowners.sh
index e03c02a4d4d1..3551f736fa06 100755
--- a/scripts/check-codeowners.sh
+++ b/scripts/check-codeowners.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 cat <<EOF
-# See https://github.com/scottrigby/prometheus-helm-charts/issues/12
+# See https://github.com/prometheus-community/helm-charts/issues/12
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
@@ -9,15 +9,19 @@ cat <<EOF
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @prometheus-community/helm-charts-admins
 
-/.github/workflows/ @prometheus-community/helm-charts-admins @jkroepke @GMartinez-Sisti
-/renovate.json @prometheus-community/helm-charts-admins @jkroepke @GMartinez-Sisti
+/.github/workflows/ @prometheus-community/helm-charts-admins @GMartinez-Sisti
+/renovate.json @prometheus-community/helm-charts-admins @GMartinez-Sisti
 
 EOF
 
-for DIR in $(ls -1 -d ./charts/*)
-do
-  FILE="$DIR/Chart.yaml"
-  DIR=$(echo $DIR | sed 's/^\.//')
-  MAINTAINERS=$(yq e '.maintainers.[].url' $FILE | sed 's!^https://github.com/!@!' | sort --ignore-case)
-  echo $DIR/ $MAINTAINERS
-done
+get_maintainers() {
+  local chart_file="$1"
+  yq e '.maintainers.[].url' "${chart_file}" |
+    sed 's!^https://github.com/!@!' |
+    sort --ignore-case
+}
+
+for chart_file in charts/*/Chart.yaml; do
+  maintainers="$(get_maintainers "${chart_file}")"
+  echo "/${chart_file/%Chart.yaml}" "${maintainers//[$'\r\n']/ }"
+done | sort -k 1