diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f518b4fd091..725e9395a65 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -275,7 +275,7 @@
 /pkg/services/store/ @grafana/grafana-app-platform-squad
 /pkg/infra/filestorage/ @grafana/grafana-app-platform-squad
 /pkg/modules/ @grafana/grafana-app-platform-squad
-/pkg/services/grpcserver/ @grafana/grafana-app-platform-squad
+/pkg/services/grpcserver/ @grafana/grafana-search-and-storage
 /pkg/generated @grafana/grafana-app-platform-squad
 
 # Alerting