diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 142384bd1..3884e634e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,24 +1,50 @@
 ---
 name: Bug report
 about: Create a report for error, failure, or unexpected behavior
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Logs**
-If you've got any logs/outputs, attach them
-
-**Versions (please complete the following information):**
- - OS that is executing Terraform
- - Terraform
+### Nutanix Cluster Information
+<!-- 
+Please provide the version of:
  - Nutanix Cluster (Prism Element / AOS)
  - Nutanix Prism Central
- - Terraform provider version (using posted RC1? Compiling yourself? If so, from Develop or Master, and what commit id?
-
-**Additional context**
-Add any other context about the problem here.
+-->
+### Terraform Version
+<!--- Please run `terraform -v` to show the Terraform core version and provider version(s). If you are not running the latest version of Terraform or the provider, please upgrade because your issue may have already been fixed. [Terraform documentation on provider versioning](https://www.terraform.io/docs/configuration/providers.html#provider-versions). --->
+### Affected Resource(s)
+<!--- Please list the affected resources and data sources. --->
+* nutanix_XXXXX
+### Terraform Configuration Files
+<!--- Information about code formatting: https://help.github.com/articles/basic-writing-and-formatting-syntax/#quoting-code --->
+```hcl
+# Copy-paste your Terraform configurations here - for large Terraform configs,
+# please use a service like Dropbox and share a link to the ZIP file.
+```
+### Debug Output
+<!---
+Please provide a link to a GitHub Gist containing the complete debug output. Please do NOT paste the debug output in the issue; just paste a link to the Gist.
+To obtain the debug output, see the [Terraform documentation on debugging](https://www.terraform.io/docs/internals/debugging.html).
+--->
+### Panic Output
+<!--- If Terraform produced a panic, please provide a link to a GitHub Gist containing the output of the `crash.log`. --->
+### Expected Behavior
+<!--- What should have happened? --->
+### Actual Behavior
+<!--- What actually happened? --->
+### Steps to Reproduce
+<!--- Please list the steps required to reproduce the issue. --->
+1. `terraform apply`
+### Important Factors
+<!--- Are there anything atypical about your accounts that we should know?
+For example if you are using a Prism Element or Prism Central -- >
+​
+### References
+<!---
+Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests
+Are there any other GitHub issues (open or closed) or pull requests that should be linked here? Vendor documentation? For example:
+--->
+* #0000 <!---Github Issue number --->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d920..bbcbbe7d6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---