diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5dd41581914ed..8f2c27ac7c3cf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,20 +6,16 @@
 # used for the 'team' designator within Kibana Stats
 
 # App
-/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
 /src/plugins/advanced_settings/ @elastic/kibana-app
 /src/plugins/charts/ @elastic/kibana-app
-/src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
-/src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/management/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/vis_default_editor/ @elastic/kibana-app
-/src/plugins/vis_type_markdown/ @elastic/kibana-app
 /src/plugins/vis_type_metric/ @elastic/kibana-app
 /src/plugins/vis_type_table/ @elastic/kibana-app
 /src/plugins/vis_type_tagcloud/ @elastic/kibana-app
@@ -35,10 +31,8 @@
 #CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
-#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
 #CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
@@ -46,8 +40,6 @@
 #CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
 #CC# /src/legacy/ui/public/state_management @elastic/kibana-app
 #CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
-#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
-#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
 
 # App Architecture
 /examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -127,10 +119,18 @@
 #CC# /x-pack/plugins/beats_management/ @elastic/beats
 
 # Canvas
+/src/plugins/dashboard/ @elastic/kibana-app
+/src/plugins/input_control_vis/ @elastic/kibana-app
+/src/plugins/vis_type_markdown/ @elastic/kibana-app
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
+/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
+#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
+#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
 #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
 #CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
+#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
+#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon