From 5a7b00c037f53ddfa451e4428e42bb4ac691ec85 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Tue, 11 May 2021 20:41:01 -0400
Subject: [PATCH] Update issue template (#1317)

* Update Issue Template to match other repos

* Removed version number ref

* Add language asking to refrain from version bumps
---
 CONTRIBUTING.md   |  1 +
 ISSUE_TEMPLATE.md | 56 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 634a0061d2..5331e9f7bb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,6 +24,7 @@ Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/serve
 
 * commit any pull requests against the `master` branch
 * include a link to your Community Forums post
+* please do **not** submit version number updates/bumps
 
 # Setup guide
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 7a70e7be69..56d9af87cc 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,5 +1,57 @@
 <!--
-Please do not submit feature requests. The [Community Forums][1] has a
-section for submitting, voting for, and discussing product feature requests.
+Please do not submit feature requests. The [Community Forums][1]
+has a section for submitting, voting for, and discussing product
+feature requests.
 [1]: https://community.bitwarden.com
+
+Please remove HTML comments before finalizing your submission.
+-->
+
+## Describe the Bug
+
+<!-- Comment:
+A clear and concise description of what the bug is.
+-->
+
+## Steps To Reproduce
+
+<!-- Comment:
+How can we reproduce the behavior:
+-->
+
+1. HTTP GET to '...'
+2. Copy response and HTTP POST to '....'
+3. Run command '....' via CLI
+4. Validate response has '...'
+
+## Expected Result
+
+<!-- Comment:
+A clear and concise description of what you expected to happen.
+-->
+
+## Actual Result
+
+<!-- Comment:
+A clear and concise description of what is happening.
+-->
+
+## Screenshots or Videos
+
+<!-- Comment:
+If applicable, add screenshots and/or a short video to help explain your problem.
+-->
+
+## Environment
+
+- Operating system: [e.g. Cloud, Windows 10, Mac OS Catalina]
+- Build Version: [e.g. 1.42.0]
+- Self Hosted: [true/false]
+- Environment: [e.g. Cloud, Docker, EKS, ECS, K8S]
+- Hardware: [e.g. Intel 6-core, 8GB RAM]
+
+## Additional Context
+
+<!-- Comment:
+Add any other context about the problem here.
 -->