diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index af22b4d4..376a053b 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -6,11 +6,11 @@ labels: bug
 assignees: ""
 ---
 
-{{ feel free to delete any section and add comments freeform }}
+<!-- feel free to delete any section and add comments freeform -->
 
 ### Description
 
-{{ A description of what the bug is }}
+<!-- A description of what the bug is -->
 
 #### To Reproduce
 
@@ -20,21 +20,21 @@ assignees: ""
 
 #### Expected behavior
 
-{{ What did you expect to happen? }}
+<!-- What did you expect to happen? -->
 
 #### Actual behavior
 
-{{ What happened instead? }}
+<!-- What happened instead? -->
 
-#### Screenshots
+#### Screenshot
 
-If useful and easy consider adding a screenshot
+<!-- If useful for explanation and easy to do consider adding a screenshot -->
 
 #### Environment
 
 - OS: `Windows` / `Mac` / `Linux`
-- VHA version: `3.1.0`
+- VHA version: `3.2.0`
 
 #### Additional context
 
-{{ any other comments }}
+<!-- any other comments -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 8c358139..02968dad 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -6,20 +6,20 @@ labels: enhancement
 assignees: ""
 ---
 
-{{ feel free to delete any section and add comments freeform }}
+<!-- feel free to delete any section and add comments freeform -->
 
 ### Description
 
-{{ Describe the feature or enhancement you'd like to see implemented in VHA }}
+<!-- Describe the feature or enhancement you'd like to see implemented in VHA -->
 
 #### What problem does this solve?
 
-{{ Explain why this feature is important, what problem it solves, and how it benefits the users }}
+<!-- Explain why this feature is important, what problem it solves, and how it benefits the users -->
 
 #### Proposed Solution
 
-{{ Describe how the feature should work, providing examples if possible }}
+<!-- Describe how the feature should work, providing examples if possible -->
 
 #### Additional context
 
-{{ Add any other comments }}
+<!-- Add any other comments -->
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index aa3dfd75..d8ed9d29 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -5,4 +5,4 @@ title: "[OTHER] "
 assignees: ""
 ---
 
-{{ share a brief description of what you are thinking }}
+<!-- share a brief description of what you are thinking -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 44235706..77bf04f3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
-## Description
+<!-- 🙇‍♂️ Thank you very much for contributing to VHA ♥ -->
 
-Fixes #{{issue number}}
+Related issue: #{{issue number}}
 
-{{please add any additional comments too}}
+<!-- please add any additional comments too -->