diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ae1b22f9be3..84dec49745d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -112,7 +112,7 @@ WORKFLOW.md @torkelo
 /pkg/services/pluginsettings/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
-/pkg/services/publicdashboards/ @grafana/backend-platform
+/pkg/services/publicdashboards/ @grafana/dashboards-squad
 /pkg/services/query/ @grafana/backend-platform
 /pkg/services/queryhistory/ @grafana/backend-platform
 /pkg/services/quota/ @grafana/backend-platform