diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index c648ea6d3e793ea6c35d5739e0d6905282b972d9..2607f5555de1fd6028adcc674c7a4729f2ea8457 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 7ac3b1663401002ba46cdf1b0ddadb49c856372e..242c6c765f68ce58513762c9d579c88181fd9261 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index b73e74478eac0eaf6c029d1c533da7884c3c9c75..5a11985921305adc0c1bb2e2a079414a6e0090e1 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index f29588703fc0d4ab2b69d66d1eb4961bee9ced22..424b52723412d939077a0f019ef3334ad11eaf43 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index ae449f4ce41b162c0742f4c020aafc61b19f610c..6bebf872b6c6aca49c5a50c4a093edfcd4a4d347 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.artifacts.object_store.provider
 description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 61df7c0a7939fd8853a857b734ee3c00340a2611..ddc06cf8ac073eb075e93c7260cc8841f91ca3b2 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index d506f8bd727abc75b0fa7674c3d88aad42bc71ba..8cb1e3dfec4ca0bf59094f8cc3b4ecdbeefe3de8 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index d246768a52a72569bbf4c7d3b2efc816e59d5fef..4aad9a2bf6f87485934f67bc98ab68a0092ddbbd 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index fddcce4691bff940bbc2b980f149764fe6d1ac9a..d120ff46667b47a172b2b477c80472e96a11b3fe 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -5,7 +5,7 @@ description: Whether Background Upload for Object Storage is enabled for Externa
   Diffs
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 615badfd7616baf141be271d91998057536cc7b7..d602e3d2e2d9b96520284ca903a060ff61150fc0 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.external_diffs.object_store.provider
 description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 0da06a20e36efa0974bd90622a2f112ccebedef3..6ca94460868b0006a0032728e3d722d45f901293 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index b76c51857cf501b201a8c11282b659a288f0eb9a..429e83301135c0e4e8ac1aa7592b68a936736c6e 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 2aec5df1117a9d6c5fa3953206990c35a11f280b..fb03c772f325ba8fa70fea410dafddb31246dd27 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index fb92b12d608997706d0e45107d76cae3162e7a66..89dda19b337d5ee876d0f051595854ff975a9cf9 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index c9fe9bf9e2a5459308243d101ec16a3f27b5087b..bbb9a6659dd7627f6376fe79cab6bef563a6a4d6 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.lfs.object_store.provider
 description: What Object Storage provider has been configured for LFS
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index f4296a1d4eb5e296667b41b81705d555073c8907..a9d1e8ec4fbfe693d3fb705a3da3e91428320b00 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 41b35c32ab8861addefa9ccfd1c69bd80159eba3..872099262c539b3bb5df3b74c6a41bd333e776db 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index f891271bdbee0d60ac005dfead16a91c1efbe579..af6ef42ed139fdac6ed547253e5c870b1fa6d251 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 2ed457f426228749f8b18f1214061a8244ea2005..a556f8529230470350fdaa78ca93fe15ea767ac0 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 4572ab0330de82b03cc3237025c5ceee06dac0ae..56320822315e1680b04db17403f51054a5a2aee4 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.uploads.object_store.provider
 description: What Object Storage provider has been configured for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 97ea6ccc5c51cf3ae49e50f6cb4a8b9fbcb7d0bc..6704506e40c112201349e4456be0860d30ffd358 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index aaeb66f10c273dbc082264304478a7b9f3bb17cf..40785c514d33ebe4acde1b31bba6b2e27031c9a8 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.enabled
 description: Whether Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 0463c0726c7a16ab15f478fe410d40c514b0ecc6..e61f2411681b0940fcd149a56610029fcc4e983f 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 5c9afd5a28187f3ffd325183eb4db3ecf5290556..3b1f51a7505bb7c5117671e27ecd207500c87341 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: boolean
 status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 38143e1f4b99d4999038725c0e8972ae65c424a6..3c27fd94c39ea0b7f6790603c35642ddebaa201d 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -4,7 +4,7 @@ key_path: object_store.packages.object_store.provider
 description: What Object Storage provider has been configured for Packages
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: string
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index 1d25dfed3a93c67c95825eeb9ea05ff7e58eec04..0698af80bcb416a4a34d4293d0bec187558b5091 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -4,7 +4,7 @@ key_path: topology
 description: Topology data
 product_section: enablement
 product_stage: enablement
-product_group: memory
+product_group: application_performance
 value_type: object
 status: active
 milestone: "13.11"