diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature.yml
rename to .github/ISSUE_TEMPLATE/feature-request.yml
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/problem-report.yml
similarity index 94%
rename from .github/ISSUE_TEMPLATE/bug.yml
rename to .github/ISSUE_TEMPLATE/problem-report.yml
index b1ec358..5587952 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/problem-report.yml
@@ -1,46 +1,46 @@
-name: 🐞 Bug Report
-description: Tell us about something that's not working the way we (probably) intend.
+name: 🐞 Problem Report
+description: Tell us about something that's not working the way you expect.
 body:
   - type: input
     id: version
     attributes:
       label: Version
       placeholder: 21.7.0 ← should look like this (check the footer)
       description: What version of self-hosted Sentry are you running?
     validations:
       required: true
   - type: textarea
     id: repro
     attributes:
       label: Steps to Reproduce
       description: How can we see what you're seeing? Specific is terrific.
       placeholder: |-
         1. foo
         2. bar
         3. baz
     validations:
       required: true
   - type: textarea
     id: expected
     attributes:
       label: Expected Result
     validations:
       required: true
   - type: textarea
     id: actual
     attributes:
       label: Actual Result
       description: Logs? Screenshots? Yes, please.
       placeholder: |-
         e.g.:
         - latest install logs: `ls -1 sentry_install_log-*.txt | tail -1 | xargs cat`
         - `docker-compose logs` output
     validations:
       required: true
   - type: markdown
     attributes:
       value: |-
-        ## Thanks 🙏
+        ## Thanks
         Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
     validations:
       required: false