diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 223cc4c693..3bb6f166c0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,17 +25,27 @@ body:
       label: A link to a reproduction repository
       description: The fastest way to describe your bug is to provide a reproduction repository.
       placeholder: https://github.com/project/link-to-your-reproduction-repo
+
   - type: markdown
     attributes:
       value: |
         Check out [CONTRIBUTING.md](https://github.com/netlify/netlify-plugin-nextjs/blob/main/CONTRIBUTING.md#what-is-a-reproducible-test-case) for advice on producing a reproduction repo.
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Plugin version
+      description: The version of `@netlify/plugin-nextjs` that you are using. (This is in the build logs)
+      placeholder: x.x.x
+    validations:
+      required: true
+
   - type: checkboxes
     id: more-info
     attributes:
       label: More information about your build
       options:
         - label: I am building using the CLI
-        - label: I am building using file-based configuration (netlify.toml)
+        - label: I am building using file-based configuration (`netlify.toml`)
   - type: dropdown
     id: which-os
     attributes:
@@ -51,8 +61,22 @@ body:
     attributes:
       label: Your `netlify.toml` file
       description: (If you're using file-based config) Please provide a copy of your `netlify.toml` file.
-      render: shell
+      value: |
+        <details>
+          <summary>`netlify.toml`</summary>
+        ```toml
+        # Paste content of your `netlify.toml` file here
+        ```
+        </details>
+
   - type: textarea
     id: logs
     attributes:
       label: Relevant log output (or link to your logs)
+      value: |
+        <details>
+          <summary>Build logs</summary>
+        ```
+        # Paste logs here
+        ```
+        </details>
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b7809deef0..1d116d9408 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,27 +1,22 @@
-<!--Please tag yourself as the Assignee and at least one specific Ecosystem engineer as the Reviewer (@ascorbic, @lindsaylevine, @tiffanosaurus) -->
+<!--Please tag yourself as the Assignee and netlify/integrations as the Reviewer -->
 
 ### Summary
-<!-- Provide a summary brief summary of the change. -->
 
-### Screenshots changes if applicable
-<!-- Please delete this section if not applicable to this PR. -->
-
-**Before:**
-
-**After:**
+<!-- Provide a brief summary of the change. -->
 
 ### Test plan
 
-1. Visit the Deploy Preview ([insert link to specific page]())
-   ...
+1. Visit the Deploy Preview ([insert link to specific page]()) ...
 
-### Relevant links (GitHub issues, Notion docs, etc.) or a picture of cute animal (small picture)
+### Relevant links (GitHub issues, Notion docs, etc.) or a picture of cute animal
 
 ### Standard checks:
+
 <!-- Please delete any options that reviewers shouldn't check. -->
 
 - [ ] Check the Deploy Preview's Demo site for your PR's functionality
 - [ ] Add docs when necessary
+
 ---
 
 🧪 Once merged, make sure to update the version if needed and that it was published correctly.
diff --git a/.prettierignore b/.prettierignore
index 7f48946c0c..d4f428c784 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,3 @@
-# Markdown
-*.md
-
 # Logs
 logs
 *.log
@@ -19,6 +16,5 @@ node_modules
 .parcel-cache
 
 # Test
-demo
 lib
 tsconfig.json
\ No newline at end of file