diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 42ceab9562273..d8c0ae4a84f7f 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -48,6 +48,9 @@ body:
         - 'Issues - Suggested Fix'
         - 'Projects'
         - 'Performance'
+        - 'Starfish'
+        - 'Starfish - API'
+        - 'Starfish - Database'
         - 'Profiling'
         - 'Replays'
         - 'Crons'
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 919be17cff90c..55d40e6653993 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -32,6 +32,9 @@ body:
         - 'Issues - Suggested Fix'
         - 'Projects'
         - 'Performance'
+        - 'Starfish'
+        - 'Starfish - API'
+        - 'Starfish - Database'
         - 'Profiling'
         - 'Replays'
         - 'Crons'
diff --git a/.github/labels.yml b/.github/labels.yml
index 1958482d40b6d..6643ff581b731 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -203,6 +203,12 @@
   color: '8D5494'
 - name: 'Product Area: Performance'
   color: '8D5494'
+- name: 'Product Area: Starfish'
+  color: '8D5494'
+- name: 'Product Area: Starfish - API'
+  color: '8D5494'
+- name: 'Product Area: Starfish - Database'
+  color: '8D5494'
 - name: 'Product Area: Profiling'
   color: '8D5494'
 - name: 'Product Area: Replays'