diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c926f10c93..361c3c0683 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -32,12 +32,11 @@ body:
     id: tf-version
     attributes:
       label: Terraform Version
-      description: Run `terraform version` to show the version, and paste the result between `` marks. If you are not running the latest version of Terraform, please try upgrading because your issue may have already been fixed.
+      description: Run `terraform version` to show the version, and paste the result below. If you are not running the latest version of Terraform, please try upgrading because your issue may have already been fixed.
       placeholder:
+      render: shell
       value: |
-        ```
         ...output of `terraform version`...
-        ```
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 0637f977eb..5e13df466f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -21,13 +21,11 @@ body:
     id: tf-version
     attributes:
       label: Terraform Version
-      description: Run `terraform version` to show the version, and paste the result between `` marks. If you're not using the latest version, please check to see if something related to your request has already been implemented in a later version.
-
+      description: Run `terraform version` to show the version, and paste the result below. If you're not using the latest version, please check to see if something related to your request has already been implemented in a later version.
+      render: shell
       placeholder:
       value: |
-        ```
         ...output of `terraform version`...
-        ```
     validations:
       required: true
 
@@ -68,7 +66,7 @@ body:
       placeholder:
       value:
     validations:
-      required: true
+      required: false
 
   - type: textarea
     id: tf-references