diff --git a/config/events/1669277827_API__Commits_commit.yml b/config/events/1669277827_API__Commits_commit.yml
index 9a880968efcd3c07c2fbf93e1f0c12ebc6813ebe..32d87e453f29ce91be80a1ba0618b04685981d02 100644
--- a/config/events/1669277827_API__Commits_commit.yml
+++ b/config/events/1669277827_API__Commits_commit.yml
@@ -7,7 +7,7 @@ identifiers:
 - project
 - user
 - namespace
-product_group: ide
+product_group: remote_development
 milestone: "15.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104947
 distributions:
diff --git a/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml b/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml
index 15da3ecf876828f9f1c98f31118fc9966d19afb5..c30ae1057d65983e293e6bb4ff3a92e513fba963 100644
--- a/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml
+++ b/config/events/1669597397_Gitlab__UsageDataCounters__EditorUniqueCounter_ide_edit.yml
@@ -6,7 +6,7 @@ identifiers:
   - project
   - user
   - namespace
-product_group: ide
+product_group: remote_development
 milestone: "15.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104809
 distributions:
diff --git a/config/events/20210915205100_default_execute_toolbar_control.yml b/config/events/20210915205100_default_execute_toolbar_control.yml
index 17a2f5346a3ca25fe96e654d7f1d668ca87a1e5b..0c8d448b750598aa79d16ff70439860c4f1fb068 100644
--- a/config/events/20210915205100_default_execute_toolbar_control.yml
+++ b/config/events/20210915205100_default_execute_toolbar_control.yml
@@ -3,7 +3,7 @@ category: default
 action: execute_toolbar_control
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61065
 distributions:
diff --git a/config/events/20210915205101_default_execute_keyboard_shortcut.yml b/config/events/20210915205101_default_execute_keyboard_shortcut.yml
index 0cd780ae156b4726e016a8160e60949b0dadab71..9c49620192d2d041ee2b883e20f51b9f4a2f20c4 100644
--- a/config/events/20210915205101_default_execute_keyboard_shortcut.yml
+++ b/config/events/20210915205101_default_execute_keyboard_shortcut.yml
@@ -3,7 +3,7 @@ category: default
 action: execute_keyboard_shortcut
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61248
 distributions:
diff --git a/config/events/20210915205102_default_execute_input_rule.yml b/config/events/20210915205102_default_execute_input_rule.yml
index d26708ac71290c20493beda97e57c19d0757886a..fa1999f3eea432e13b824421659369e3f8471c71 100644
--- a/config/events/20210915205102_default_execute_input_rule.yml
+++ b/config/events/20210915205102_default_execute_input_rule.yml
@@ -3,7 +3,7 @@ category: default
 action: execute_input_rule
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61248
 distributions:
diff --git a/config/events/20210915205103_default_execute_bubble_menu_control.yml b/config/events/20210915205103_default_execute_bubble_menu_control.yml
index 09846093e5d28e05dc091b76f97551fa8783e8d2..a7747bae2cffa6487b70ec8fb8a2bd3e9ba93aaa 100644
--- a/config/events/20210915205103_default_execute_bubble_menu_control.yml
+++ b/config/events/20210915205103_default_execute_bubble_menu_control.yml
@@ -3,7 +3,7 @@ category: default
 action: execute_bubble_menu_control
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67363
 distributions:
diff --git a/config/events/20210915205108_default_type_search_query.yml b/config/events/20210915205108_default_type_search_query.yml
index d6125e3746e9e54cba25fd07914c7caa6343a450..98d84f3551d245073ff2486cb5a533e691727080 100644
--- a/config/events/20210915205108_default_type_search_query.yml
+++ b/config/events/20210915205108_default_type_search_query.yml
@@ -3,7 +3,7 @@ category: default
 action: type_search_query
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "13.7"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47589
 distributions:
diff --git a/config/events/20210915205145_default_content_editor_loaded.yml b/config/events/20210915205145_default_content_editor_loaded.yml
index 74975d960860c9cf2fb1f66f1117580bc0846312..45f73f37730dca65f0a6060a9556589ae4186ccb 100644
--- a/config/events/20210915205145_default_content_editor_loaded.yml
+++ b/config/events/20210915205145_default_content_editor_loaded.yml
@@ -3,7 +3,7 @@ category: default
 action: content_editor_loaded
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62919
 distributions:
diff --git a/config/events/20210915205146_default_saved_using_content_editor.yml b/config/events/20210915205146_default_saved_using_content_editor.yml
index ee83ce55f373f081435d8409b3a5e083115b88c5..117469511bb4622d9ae3bc12f4de5d34e7c602a2 100644
--- a/config/events/20210915205146_default_saved_using_content_editor.yml
+++ b/config/events/20210915205146_default_saved_using_content_editor.yml
@@ -3,7 +3,7 @@ category: default
 action: saved_using_content_editor
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62919
 distributions:
diff --git a/config/events/20211215022206_default_click_menu.yml b/config/events/20211215022206_default_click_menu.yml
index cbcfab455179ad5999348fc794067d32e8e5bd60..284b6b02f3b657dd80d50f15bca60ac09a99eedd 100644
--- a/config/events/20211215022206_default_click_menu.yml
+++ b/config/events/20211215022206_default_click_menu.yml
@@ -7,7 +7,7 @@ extra_properties:
   menu_display:
     type: string
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62030
 distributions:
diff --git a/config/events/20211215022206_default_click_menu_item.yml b/config/events/20211215022206_default_click_menu_item.yml
index 2085f7f7c81ffb3b3cff95717901708a87e740ff..64cb78ea6d39943edf7e027e7bda73eef75efca3 100644
--- a/config/events/20211215022206_default_click_menu_item.yml
+++ b/config/events/20211215022206_default_click_menu_item.yml
@@ -7,7 +7,7 @@ extra_properties:
   menu_display:
     type: string
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62030
 distributions:
diff --git a/config/events/20230727180523_default_click_consolidated_edit.yml b/config/events/20230727180523_default_click_consolidated_edit.yml
index 83a9c57d98485998f8efaae6e39bdebb147c3cdf..92f2ca15c35a8e4cb76e0dd0c203209ab5ea18be 100644
--- a/config/events/20230727180523_default_click_consolidated_edit.yml
+++ b/config/events/20230727180523_default_click_consolidated_edit.yml
@@ -4,7 +4,7 @@ category: default
 action: click_consolidated_edit
 extra_properties:
 identifiers:
-product_group: ide
+product_group: remote_development
 milestone: "16.3"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127163
 distributions:
diff --git a/config/events/create_commit_from_web_ide.yml b/config/events/create_commit_from_web_ide.yml
index fccea68a2dd5df0b55c23f8ee6db798fd31b1653..da226f04bd9bc3a46cfd8915b72f28444c0fded5 100644
--- a/config/events/create_commit_from_web_ide.yml
+++ b/config/events/create_commit_from_web_ide.yml
@@ -6,7 +6,7 @@ identifiers:
   - project
   - user
   - namespace
-product_group: ide
+product_group: remote_development
 milestone: '17.1'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149507
 distributions:
diff --git a/config/events/create_merge_request_from_web_ide.yml b/config/events/create_merge_request_from_web_ide.yml
index b144257829276300cce8f4d618ca0e7677de961e..c677478ac713b920af9354b8d3c0ce468c78ee77 100644
--- a/config/events/create_merge_request_from_web_ide.yml
+++ b/config/events/create_merge_request_from_web_ide.yml
@@ -6,7 +6,7 @@ identifiers:
   - project
   - user
   - namespace
-product_group: ide
+product_group: remote_development
 milestone: '17.1'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149507
 distributions:
diff --git a/config/events/web_ide_viewed.yml b/config/events/web_ide_viewed.yml
index 7d4800eb1fe5456d73695eb2692343124218b13b..72e16e20992261835f20c2be38760993de24b7f9 100644
--- a/config/events/web_ide_viewed.yml
+++ b/config/events/web_ide_viewed.yml
@@ -7,7 +7,7 @@ identifiers:
 - project
 - user
 - namespace
-product_group: ide
+product_group: remote_development
 milestone: "16.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143495
 distributions:
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index c64efb1748ddc9f426f932230b1936066fbe3816..3a86ecfe316910bea8a2f9fb64896f6d65c1f4f8 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts_monthly.personal_snippets
 description: Monthly count of personal Snippets
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index 8cb3d155e89e272741e148fbd0cb5439251e6899..b783331ac674cbc1beb5eb715461f9f56ae8bc5d 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
 description: Number of users editing using web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111351
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index dc8e6220a0268b4be1f61b67a874cb2bd14bc6f1..d1add7913c0449626facb3fc397d7a0d3090d846 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
 description: Number of users using the static site editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 12d31bb94982f9d3ad03c6c7ee6b70aab7e9be8a..bf9cc443875ec8b2208c43245f5bba3e24aa2e65 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -2,7 +2,7 @@
 data_category: operational
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
 description: Number of unique users per month who edited a file from any web editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index 978edc7592238ceda8b119ce083de0c1553afde4..3bc4962077c19ddebfb06defbd04b0db7047a9fc 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
 description: Number of users editing a file from the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index ad839dba21accfade5feceb5fa30d8acd700c1f9..2ed4549983721dd78455d731fb2fa290efc4d9f1 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
 description: Count of unique users per month who edited a file from the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index f732715f16cde213356f6be17cf391cdc3b371d9..d045b667f4e29e7728bc1eead045838679c49890 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
 description: Unique monthly active users of the Wiki
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 milestone_removed: "15.10"
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index 711c82afa350b561b7c58a35bb5039e0b8859e75..78597a1244cdd8bd1dc3a7968eea7d20367f4878 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
 description: Number of user editing files using the Static Site Editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220428154012_live_preview.yml b/config/metrics/counts_28d/20220428154012_live_preview.yml
index 881cc0b1df7e2dbc3e6b7d188b3afd40a1abd664..fbdb5649dce7833a4c9075268eedbe1a66c5f200 100644
--- a/config/metrics/counts_28d/20220428154012_live_preview.yml
+++ b/config/metrics/counts_28d/20220428154012_live_preview.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_live_preview_edit
 description: Count of monthly unique users that successfully connect to Live Preview
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85420
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 8121324104586621eb9dd85d1b1e978f45ff9308..d29c1207658230b572af45bcc0ba960a255b8cb9 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
 description: Weekly number of users editing using the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index a0172e05543e8f87a7024dcf8da04fe1b42f22b5..8d569277a7032a2053e721d71e26946f496ac085 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
 description: Weekly number of users editing a file using the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index 02a6fcd1f7b25daa4607fb0fe524c4efb319badb..5767d3caa59f4f59215b5a031e061562d3b296a6 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
 description: Weekly number of users editing using the Static Site Editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index 5d5d8eff579db81fd0206477ea04c7da37a3eea7..6f7f72860ceeacf14a6c1de63583e35d4865e524 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -2,7 +2,7 @@
 data_category: operational
 key_path: counts.web_ide_commits
 description: Count of commits made from the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index bef15e4a6ce3104a719ef0162f6aa239db6af0a4..65bca91d6ad1ba2248b7ddef81fd2ecf8080e079 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_views
 description: Count of views of the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index 7b50a6545854f4cbce24c01f9b7661404e1ef521..647562edbf415043db3789f20595df804ba72518 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_merge_requests
 description: Count of merge requests created from the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index 6f4e20ca839e338b144097cb0f305e6abd68269b..74be473d578cba8096c4bc51c96603136d1f2b55 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_previews
 description: Count of Live Preview tab views in the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index b2081aeaf0d6db10acdca68b4603375f54374598..fcc5771e28b5e0668a3827452bc52442c55ea185 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_terminals
 description: Count of Web Terminal tab views in the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index cf88b6b5b5ea9d92d34577827047a3f6e3d1ea4a..fe9c7e074d43171f0b88f68da06b66aac8246c20 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_pipelines
 description: Count of Pipeline tab views in the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index 39d4c97639eeb714b7ebf56caf25f6369c2d38b4..e776c33ea329b0c88ec6a251632075d7102995f9 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.static_site_editor_views
 description: Count of Static Site Editor views
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index 2e66d69e1705102add46ef16fbbb3e2b26523e7d..05cc706d95a9f7073b64d63b3076055123c887ce 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.static_site_editor_commits
 description: Count of commits created from the Static Site Editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 1f88c2b767981c16ef201e2609d8bd823a36fa55..0e065f9aef02342d6bf877bc3f55c40675d08d89 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.static_site_editor_merge_requests
 description: Count of merge requests created via Static Site Editor
-product_group: ide
+product_group: remote_development
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 91973bdac78e6bf9501754d4e2220fe64468175f..0c162546a62adc159c3d31b904b08ac3dcecabd8 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.user_preferences_user_gitpod_enabled
 description: Count of users with the GitPod integration enabled
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index c49a4ece9c7b2cca4835d9a3d517d2a1d0697a74..1aff7a833648c3e20790bcf2725587918dad0280 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.pages_domains
 description: Total GitLab Pages domains
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
index 41e29315fdae29f626f469e4ee3bb31ed03d55c1..20a789b13ed595aad41f567531d7fcd99be42310 100644
--- a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
+++ b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: counts.web_ide_previews_success
 description: Count of Live Preview tab successful initializations in the Web IDE
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index fd9eef426f0f6a2462b30ed8cc461defcf58d535..adba5875f338ef93c90b915a92ff613dcd30378a 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -2,7 +2,7 @@
 data_category: operational
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
-product_group: ide
+product_group: remote_development
 value_type: string
 status: active
 milestone: "<13.9"
diff --git a/config/metrics/schema/product_groups.json b/config/metrics/schema/product_groups.json
index b15eefd240c4466285de7019de0446cf4ba534c0..d6fb9d0e7000bf7d0d8c88cb71ffb47091a6de45 100644
--- a/config/metrics/schema/product_groups.json
+++ b/config/metrics/schema/product_groups.json
@@ -37,7 +37,6 @@
     "gitaly_git",
     "global_search",
     "hosted_runners",
-    "ide",
     "import_and_integrate",
     "infrastructure",
     "knowledge",
@@ -57,6 +56,7 @@
     "pubsec_services",
     "quality",
     "respond",
+    "remote_development",
     "runner",
     "scalability",
     "secret_detection",
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index 73cc523424018e2dd60e5e767081c3cefa8d8c44..22736e9917359383a5260a6273f3cd4737fc45aa 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: web_ide_clientside_preview_enabled
 description: Whether Web IDE clientside preview is enabled
-product_group: ide
+product_group: remote_development
 value_type: boolean
 status: removed
 time_frame: none
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 723d3cfc139bf023832e652b70c8e22cb8007e64..15f067e7172854e834e70cee773a22d723908b4f 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -2,7 +2,7 @@
 data_category: operational
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
-product_group: ide
+product_group: remote_development
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 390c62e2086c5dc7ba5f8c34c7a9b1df981cae21..e95c87ccea7873b38d906bf8bb026f7be1f8f501 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -2,7 +2,7 @@
 data_category: optional
 key_path: gitpod_enabled
 description: Whether Gitpod is enabled in the instance
-product_group: ide
+product_group: remote_development
 value_type: boolean
 status: active
 time_frame: none
diff --git a/ee/config/metrics/counts_28d/20230510181628_users_updating_workspaces_monthly.yml b/ee/config/metrics/counts_28d/20230510181628_users_updating_workspaces_monthly.yml
index 3d6de0e72d8ee760d18b21d02672f00321586624..c4302ee156367a9253e0f4d9d62be39eb3accdc2 100644
--- a/ee/config/metrics/counts_28d/20230510181628_users_updating_workspaces_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230510181628_users_updating_workspaces_monthly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.workspaces.users_updating_workspaces_monthly
 description: Count of users updating workspaces
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/ee/config/metrics/counts_28d/20230510181855_users_creating_workspaces_monthly.yml b/ee/config/metrics/counts_28d/20230510181855_users_creating_workspaces_monthly.yml
index 7f4f72eb66c661d5b6f4ae8add1e53b4c01fd546..dc6eb23cb9922613c9e137b59789dc1dc60869a7 100644
--- a/ee/config/metrics/counts_28d/20230510181855_users_creating_workspaces_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230510181855_users_creating_workspaces_monthly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.workspaces.users_creating_workspaces_monthly
 description: Count of users creating workspaces
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/ee/config/metrics/counts_7d/20230510181628_users_updating_workspaces_weekly.yml b/ee/config/metrics/counts_7d/20230510181628_users_updating_workspaces_weekly.yml
index 441320e2665fc3610efe7dded58161435efe1f8d..173a4e05ea9035a2032d1c171fc85041765eb8a8 100644
--- a/ee/config/metrics/counts_7d/20230510181628_users_updating_workspaces_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230510181628_users_updating_workspaces_weekly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.workspaces.users_updating_workspaces_weekly
 description: Count of users updating workspaces
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/ee/config/metrics/counts_7d/20230510181854_users_creating_workspaces_weekly.yml b/ee/config/metrics/counts_7d/20230510181854_users_creating_workspaces_weekly.yml
index c90ebc2cf6ade629e9c4987fec318ce462d2c552..010eb3d8a0efcbcd78d0717e1e5a938966350b04 100644
--- a/ee/config/metrics/counts_7d/20230510181854_users_creating_workspaces_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230510181854_users_creating_workspaces_weekly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.workspaces.users_creating_workspaces_weekly
 description: Count of users creating workspaces
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/ee/config/metrics/counts_all/20230510151446_remote_agent_configurations.yml b/ee/config/metrics/counts_all/20230510151446_remote_agent_configurations.yml
index 040d34a7d1fc1ac3f570a94092ab6db6526c5d79..5564a459f4869f00298cdd82c96f815b6109419b 100644
--- a/ee/config/metrics/counts_all/20230510151446_remote_agent_configurations.yml
+++ b/ee/config/metrics/counts_all/20230510151446_remote_agent_configurations.yml
@@ -1,7 +1,7 @@
 ---
 key_path: counts.remote_agent_configurations
 description: Count of remote agent configurations
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"
diff --git a/ee/config/metrics/counts_all/20230510152124_workspaces.yml b/ee/config/metrics/counts_all/20230510152124_workspaces.yml
index 64baf5dc7675042cb58da42e0f1a1665b12347c2..3623c5887fcfc463b81f92ae803830481cfc55a5 100644
--- a/ee/config/metrics/counts_all/20230510152124_workspaces.yml
+++ b/ee/config/metrics/counts_all/20230510152124_workspaces.yml
@@ -1,7 +1,7 @@
 ---
 key_path: counts.workspaces
 description: Count of workspaces
-product_group: ide
+product_group: remote_development
 value_type: number
 status: active
 milestone: "16.0"