diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ef37e3d06..11bc445ac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,33 +1,44 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve pgAdmin
 title: ''
 labels: Bug
 assignees: ''
 
 ---
 
+**_Please note that security bugs or issues should be reported to security@pgadmin.org._**
+
 **Describe the bug**
+
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. See the error
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
+**Error message**
+
+If possible, include the full, unedited text of any error messages displayed.
+
 **Screenshots**
+
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows 10, OSX monterey]
  - Version: [e.g. 6.15]
- -  Mode: [e.g Desktop or Server]
- - Browser: (Only in case of Server Mode)[e.g. chrome, safari]
- - Package: (E.g. RPM, DEB, Python, etc.)
+ - Mode: [e.g Desktop or Server]
+ - Browser (if running in server mode): [e.g. chrome, safari]
+ - Package type: [e.g. RPM, DEB, Python, Container, etc.]
 
 **Additional context**
+
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1575ebd26..117c67f3e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea or new feature for pgAdmin
 title: ''
 labels: Feature
 assignees: ''
@@ -8,10 +8,13 @@ assignees: ''
 ---
 
 **Describe the solution you'd like**
+
 A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
+
 Add any other context or screenshots about the feature request here.