diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5c4b6bca..8fc515db 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,7 +9,8 @@ body:
       value: |
         Hi! Thanks for using the Jupyter Docker Stacks and taking some time to contribute to this project.
 
-        We'd appreciate it if you could check out the [Troubleshooting common problems](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/troubleshooting.html) section in the documentation.
+        We'd appreciate it if you could check out the [Troubleshooting common problems](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/troubleshooting.html) section in the documentation,
+        as well as [existing issues](https://github.com/jupyter/docker-stacks/issues) prior to submitting an issue to avoid duplication.
 
         Please answer the following sections to help us troubleshoot the problem.
 
@@ -34,6 +35,9 @@ body:
   - type: input
     attributes:
       label: OS system you are using
+      placeholder: |
+        Example:
+        Linux - Ubuntu
     validations:
       required: true
 
@@ -63,7 +67,7 @@ body:
   - type: textarea
     attributes:
       label: command_output
-      render: sh-session
+      render: bash session
       description: |
         Provide the output of the steps above, including the commands
         themselves and Docker's output/traceback etc. If you're familiar with
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 4537afe1..c2764279 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -6,10 +6,11 @@ title: "[ENH]: <title>"
 body:
   - type: markdown
     attributes:
-      value: >-
+      value: |
         Hi! Thanks for using the Jupyter Docker Stacks and taking some time to contribute to this project.
 
-        We'd appreciate it if you could check out the [Suggesting a new feature](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/features.html#suggesting-a-new-feature) section in the documentation for our preferred processes before submitting a feature request.
+        We'd appreciate it if you could check out the [Suggesting a new feature](https://jupyter-docker-stacks.readthedocs.io/en/latest/contributing/features.html#suggesting-a-new-feature)
+        section in the documentation for our preferred processes before submitting a feature request.
 
   - type: dropdown
     id: docker_images
@@ -26,13 +27,14 @@ body:
         - r-notebook
         - scipy-notebook
         - tensorflow-notebook
+        - new community stack
     validations:
       required: true
 
   - type: textarea
     attributes:
       label: What changes are you proposing?
-      description: >-
+      description: |
         Example:
           - Add the [altair](https://altair-viz.github.io) package to the image.
     validations:
@@ -41,11 +43,11 @@ body:
   - type: textarea
     attributes:
       label: How does this affect the user?
-      description: >-
+      description: |
         Example:
           - Altair is a declarative statistical visualization library for Python, based on Vega and Vega-Lite, and the source is available on GitHub.
           - With Altair, you can spend more time understanding your data and its meaning.
-          - Altair’s API is simple, friendly and consistent and built on top of the powerful Vega-Lite visualization grammar.
+          - Altair's API is simple, friendly and consistent and built on top of the powerful Vega-Lite visualization grammar.
           - This elegant simplicity produces beautiful and effective visualizations with a minimal amount of code.
     validations:
       required: true
@@ -53,7 +55,7 @@ body:
   - type: textarea
     attributes:
       label: Anything else?
-      description: >-
+      description: |
         Links? References? Anything that will give us more context about the feature you are proposing.
     validations:
       required: false