diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index ee41e49bcad1387a5dbddd5235f390f1e3a74b08..31fdc454dd22686a72dbf93ae0397369fe14652e 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_mo
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: five_min_app
+product_group: 5-min-app
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 7be982f8ef2f11e18812414087409a305cbcd14e..692597a2a98ff9e159d6dcdaf52c26d79baa0330 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_we
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: five_min_app
+product_group: 5-min-app
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/schema/base.json b/config/metrics/schema/base.json
index 0d16a55c9fbfe4ce1c41f0d8454913cc7425136b..84953bdb64a9a9d3c64296fd40e02f6e041ef814 100644
--- a/config/metrics/schema/base.json
+++ b/config/metrics/schema/base.json
@@ -33,8 +33,7 @@
       ]
     },
     "product_group": {
-      "type": "string",
-      "pattern": "^$|^([a-z]+_)*[a-z]+$"
+      "type": "string"
     },
     "value_type": {
       "type": "string",