diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 91e8e796005..c3acb119e5d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -404,6 +404,9 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /public/app/core/components/TimeSeries/ @grafana/dataviz-squad
 /public/app/core/components/TimelineChart/ @grafana/dataviz-squad
 /public/app/core/components/Form/ @grafana/grafana-frontend-platform
+/public/app/core/components/OptionsUI/ @grafana/dashboards-squad @grafana/dataviz-squad
+
+
 /public/app/core/history/ @grafana/explore-squad
 /public/app/features/admin/ @grafana/identity-access-team