diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index c01215c0928f8..c2e850aed2d45 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -50,10 +50,12 @@ body:
         - 'Projects - Project Creation'
         - 'Projects - Project Details'
         - 'Performance'
+        - 'Performance - Query Insights'
         - 'Starfish'
-        - 'Starfish - API'
-        - 'Starfish - Database'
+        - 'Starfish - Interactions'
+        - 'Starfish - Page Loads'
         - 'Profiling'
+        - 'DDM'
         - 'Replays'
         - 'Crons'
         - 'Alerts'
@@ -61,6 +63,7 @@ body:
         - 'Dashboards'
         - 'Releases'
         - 'User Feedback'
+        - 'Bug Report'
         - 'Stats'
         - 'Settings'
         - 'Settings - General'
@@ -81,6 +84,7 @@ body:
         - 'Footer'
         - 'APIs'
         - 'Org Relocation'
+        - 'Unknown'
         - 'Other'
         # end product areas
     validations:
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index d7c785e0b5ff3..13978439f35e3 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -34,10 +34,12 @@ body:
         - 'Projects - Project Creation'
         - 'Projects - Project Details'
         - 'Performance'
+        - 'Performance - Query Insights'
         - 'Starfish'
-        - 'Starfish - API'
-        - 'Starfish - Database'
+        - 'Starfish - Interactions'
+        - 'Starfish - Page Loads'
         - 'Profiling'
+        - 'DDM'
         - 'Replays'
         - 'Crons'
         - 'Alerts'
@@ -45,6 +47,7 @@ body:
         - 'Dashboards'
         - 'Releases'
         - 'User Feedback'
+        - 'Bug Report'
         - 'Stats'
         - 'Settings'
         - 'Settings - General'
@@ -65,6 +68,7 @@ body:
         - 'Footer'
         - 'APIs'
         - 'Org Relocation'
+        - 'Unknown'
         - 'Other'
         # end product areas
     validations:
diff --git a/.github/labels.yml b/.github/labels.yml
index 87ee8b048399d..ade1d3b11298d 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -180,14 +180,18 @@
   color: '8D5494'
 - name: 'Product Area: Performance'
   color: '8D5494'
+- name: 'Product Area: Performance - Query Insights'
+  color: '8D5494'
 - name: 'Product Area: Starfish'
   color: '8D5494'
-- name: 'Product Area: Starfish - API'
+- name: 'Product Area: Starfish - Interactions'
   color: '8D5494'
-- name: 'Product Area: Starfish - Database'
+- name: 'Product Area: Starfish - Page Loads'
   color: '8D5494'
 - name: 'Product Area: Profiling'
   color: '8D5494'
+- name: 'Product Area: DDM'
+  color: '8D5494'
 - name: 'Product Area: Replays'
   color: '8D5494'
 - name: 'Product Area: Crons'
@@ -202,6 +206,8 @@
   color: '8D5494'
 - name: 'Product Area: User Feedback'
   color: '8D5494'
+- name: 'Product Area: Bug Report'
+  color: '8D5494'
 - name: 'Product Area: Stats'
   color: '8D5494'
 - name: 'Product Area: Settings'
@@ -242,6 +248,8 @@
   color: '8D5494'
 - name: 'Product Area: Org Relocation'
   color: '8D5494'
+- name: 'Product Area: Unknown'
+  color: '8D5494'
 - name: 'Product Area: Other'
   color: '8D5494'