diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index eff1749d81..e178ae8537 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -3,7 +3,7 @@ name: "⚠️ Bug/Issue report - React Native"
 about: Please provide as much detail as possible. Issues may be closed if they do
   not follow the template.
 title: "[\U0001F41B] Bug Report Title - CHANGE ME "
-labels: 'Help: Needs Triage, Impact: Bug'
+labels: 'Help: Needs Triage, Needs Attention, type: bug'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/Documentation_issue.md b/.github/ISSUE_TEMPLATE/Documentation_issue.md
index e349a2b827..8172dad534 100644
--- a/.github/ISSUE_TEMPLATE/Documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/Documentation_issue.md
@@ -2,7 +2,7 @@
 name: "\U0001F4D6 Documentation Feedback"
 about: Report an issue with the documentation or suggest an improvement.
 title: "[\U0001F4DA] Documentation Issue Title - CHANGE ME "
-labels: 'Help: Good First Issue, Type: Docs'
+labels: 'Help: Good First Issue, type: documentation'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..c10eab3250
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,12 @@
+---
+name: "🚀Feature Request"
+about: Make a feature request for React Native Firebase.
+title: "\U0001F41B [PACKAGE_NAME_HERE] Your feature request title here"
+labels: 'Needs Attention, type: enhancement'
+assignees: ''
+
+---
+
+## What feature would you like to see?
+
+Is there a missing a feature that is supported on an underlying SDK? Or is there a feature that you think would be useful to have in React Native Firebase?
diff --git a/.github/ISSUE_TEMPLATE/Other_platforms_bug_report.yml b/.github/ISSUE_TEMPLATE/Other_platforms_bug_report.yml
index 0f35596f10..9b88888d1d 100644
--- a/.github/ISSUE_TEMPLATE/Other_platforms_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/Other_platforms_bug_report.yml
@@ -2,8 +2,8 @@ name: '⚠️ Other Platforms - Bug/Issue report'
 title: "[\U0001F41B] Other Platforms Bug Report Title - CHANGE ME "
 labels:
   - 'Help: Needs Triage'
-  - 'Impact: Bug'
-  - 'Platform: Other'
+  - 'type: bug'
+  - 'platform: macOS (Other)'
 description: Create an issue specific to 'Other' platforms on React Native Firebase (not Android or iOS).
 body:
   - type: checkboxes
diff --git a/.github/workflows/issue-labels.yaml b/.github/workflows/issue-labels.yaml
new file mode 100644
index 0000000000..1569034f25
--- /dev/null
+++ b/.github/workflows/issue-labels.yaml
@@ -0,0 +1,36 @@
+name: Update labels on issues with OP response
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  label-op-response:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if the comment is from the OP
+        id: check-op
+        run: |
+          OP=${{ github.event.issue.user.login }}
+          COMMENTER=${{ github.event.comment.user.login }}
+
+          if [ "$OP" = "$COMMENTER" ]; then
+            echo "op_comment=true" >> $GITHUB_ENV
+          else
+            echo "op_comment=false" >> $GITHUB_ENV
+          fi
+
+      - name: Add 'Needs Attention' label if OP responded
+        if: env.op_comment == 'true'
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: 'Needs Attention'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - name: Remove 'blocked customer-response' label if OP responded
+        if: env.op_comment == 'true'
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: 'blocked: customer-response'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index d2854052a5..0f482ce093 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -30,9 +30,9 @@ jobs:
             If you think this is a mistake please comment and ping a maintainer to get this merged ASAP! Thanks for contributing!
 
             You have 15 days until this gets closed automatically
-          exempt-issue-labels: 'Keep Open,help: good-first-issue,Workflow: Needs Review'
-          exempt-pr-labels: 'Keep Open,help: good-first-issue,Workflow: Needs Review'
+          exempt-issue-labels: 'Keep Open,Help: Good First Issue,Workflow: Needs Review'
+          exempt-pr-labels: 'Keep Open,Help: Good First Issue,Workflow: Needs Review'
           close-issue-reason: not_planned
           days-before-stale: 28
           days-before-close: 15
-          stale-issue-label: 'Type: Stale'
+          stale-issue-label: 'Stale'