diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d82eae68..7c1964c6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @hunleyd @keithf4 @sharmay
+*   @hunleyd @keithf4 @pgguru @sharmay
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a9ebcb84..0b65e821 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'STATUS: UNCONFIRMED'
+labels: 'UNCONFIRMED'
 assignees: ''
 
 ---
@@ -14,9 +14,12 @@ assignees: ''
 
 
 **Tell us about your environment:**  
-- pgMonitor Version:
+- pgMonitor version:  
+- Container or non-container:  
+- Container name / image:  
+- Operating System for non-container:  
 - PostgreSQL Version:  
-- Operating System:  
-- Exporter in use:  
-- Virtualization:  
-- Any customization:  
+- Exporter(s) in use (incl. version):  
+- Prometheus version:  
+- AlertManager version:  
+- Grafana version:  
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index aa488a64..c0373a7f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an enhancement for this project
 title: ''
-labels: 'STATUS: UNCONFIRMED'
+labels: 'UNCONFIRMED'
 assignees: ''
 
 ---
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 14c68239..cd1127d0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,9 +2,9 @@
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
-Fixes (issue) #  
+Fixes #  
 
-Depends on (issue) #  
+Depends on #  
 
 ## Type of change  
 Please check all options that are relevant  
@@ -14,16 +14,22 @@ Please check all options that are relevant
 - [ ] Documentation update only  
 
 # How Has This Been Tested?  
-
 **Tested Configuration**:  
-- [ ] CentOS, Specify version(s):  
-- [ ] PostgreQL, Specify version(s):  
-- [ ] docs tested with hugo <0.60  
+- [ ] Ansible, Specify version(s):  
+- Installation method:  
+    - [ ] Binary install from source, version:  
+    - [ ] OS package repository, distro, and version:  
+    - [ ] Local package server, version:  
+    - [ ] Custom-built package, version:  
+    - [ ] Other:  
+- [ ] PostgreSQL, Specify version(s):  
+- [ ] docs tested with hugo version(s):  
 
 Tested with playbook(s):  
+
 # Checklist:  
+- [ ] My changes generate no new lint warnings  
 - I have made corresponding changes to:  
     - [ ] the documentation  
     - [ ] the release notes  
     - [ ] the upgrade doc  
-