diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 24d8b8e043f12..b79acd184d826 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,15 @@
 name: Bug report
-description: File a bug report to improve Superset's stability
+description: Report a bug to improve Superset's stability
 labels: ["bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Hello Superset Community member! Please keep things tidy by putting your post in the proper place:
+
+        🐛 Reporting a bug: use this form.
+        🙏 Asking a question or getting help: post in the [Superset Slack chat](http://bit.ly/join-superset-slack) or [GitHub Discussions](https://github.com/apache/superset/discussions) under "Q&A / Help".
+        💡 Requesting a new feature: Search [GitHub Discussions](https://github.com/apache/superset/discussions) to see if it exists already. If not, add a new post there under "Ideas".
   - type: textarea
     id: bug-description
     attributes:
@@ -30,15 +38,13 @@ body:
       value: |
         ### Environment
 
-        Please specify your environment. If your environment does not match the alternatives,
-        you need to upgrade your environment before submitting the issue as it may have already been fixed.
-        For additional information about the releases, check out the [release page](https://github.com/apache/superset/wiki).
+        Please specify your environment. If your environment does not match the alternatives, you need to upgrade your environment before submitting the issue as it may have already been fixed. For additional information about the releases, check out the [release page](https://github.com/apache/superset/wiki).
   - type: dropdown
     id: superset-version
     attributes:
       label: Superset version
       options:
-        - master
+        - master / latest-dev
         - "3.1.0"
         - "3.0.3"
     validations:
@@ -83,8 +89,7 @@ body:
     attributes:
       label: Additional context
       description: |
-        Add any other context about the problem here such as the feature flags that you have enabled,
-        any customizations you have made, etc.
+        Add any other context about the problem here such as the feature flags that you have enabled, any customizations you have made, the data source you are querying, etc.
   - type: checkboxes
     id: checklist
     attributes:
@@ -92,7 +97,7 @@ body:
       description: Make sure to follow these steps before submitting your issue - thank you!
       options:
         - label: I have searched Superset docs and Slack and didn't find a solution to my problem.
-        - label: I have checked the issue tracker for the same issue and I haven't found one similar.
-        - label: I have checked Superset logs for Python stacktraces and included it here as text if there are any.
+        - label: I have searched the GitHub issue tracker and didn't find a similar bug report.
+        - label: I have checked Superset's logs for errors and if I found a relevant Python stacktrace, I included it here as text in the "additional context" section.
     validations:
       required: true