diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index eadaf9bc..53603ebe 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -17,10 +17,13 @@ A clear and concise description of what you expected to happen.
 **System Environment**
 Describe the system environment, include:
 - OS: [e.g. RHEL 7.2]
+- Backend used [e.g. dace:cpu]
+- Environment variables set
 - Compiler(s): Type and version [e.g. Intel 19.1]
 - MPI type, and version (e.g. MPICH, Cray MPI, openMPI)
 - netCDF Version: For both C and Fortran
 - Configure options: Any additional flags, or macros passed to configure
+- If this bug came from a model run, which model
 
 **Additional context**
 Add any other context about the problem.  If applicable, include where any files
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bc235ea4..0553236c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,6 +4,7 @@ relevant motivation and context. List any dependencies that are required for
 this change.
 
 Fixes # (issue)
+If this is a hotfix to a released version, please specify it.
 
 **How Has This Been Tested?**
 Please describe the tests that you ran to verify your changes. Please also note
@@ -18,4 +19,3 @@ enough information so someone can reproduce your tests.
 - [ ] My changes generate no new warnings
 - [ ] Any dependent changes have been merged and published in downstream modules
 - [ ] New check tests, if applicable, are included
-- [ ] `make distcheck` passes