diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/1-bug.md
similarity index 61%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/1-bug.md
index 5861f19b..e2ef2e96 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/1-bug.md
@@ -1,5 +1,10 @@
-Thanks for wanting to report an issue you've found in valkey-py. Please delete this text and fill in the template below.  
-It is of course not always possible to reduce your code to a small test case, but it's highly appreciated to have as much data as possible. Thank you!
+<!--
+Thanks for wanting to report an issue you've found in valkey-py.
+Please delete this text and fill in the template below.
+It is of course not always possible to reduce your code to a
+small test case, but it's highly appreciated to have as much
+data as possible. Thank you!
+-->
 
 **Version**: What valkey-py and what valkey version is the issue happening on?
 
diff --git a/.github/ISSUE_TEMPLATE/2-feature.md b/.github/ISSUE_TEMPLATE/2-feature.md
new file mode 100644
index 00000000..979158a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature.md
@@ -0,0 +1,5 @@
+<!--
+Thanks for wanting to open a feature request!
+-->
+
+**Description**: Description of your feature request
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..94eca7d2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Security Issues
+    url: mailto:security@lists.valkey.io
+    about: Please report security vulnerabilities here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 66ba87ec..7100f371 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 ### Pull Request check-list
 
-_Please make sure to review and check all of these items:_
+<!-- Please make sure to review and check all of these items: -->
 
 - [ ] Do tests and lints pass with this change?
 - [ ] Do the CI tests pass with this change (enable it first in your forked repo and wait for the github action build to finish)?
@@ -8,9 +8,9 @@ _Please make sure to review and check all of these items:_
 - [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
 - [ ] Is there an example added to the examples folder (if applicable)?
 
-_NOTE: these things are not required to open a PR and can be done
-afterwards / while the PR is open._
+<!-- NOTE: these things are not required to open a PR and can be done
+afterwards / while the PR is open. -->
 
 ### Description of change
 
-_Please provide a description of the change here._
+<!-- Please provide a description of the change here. -->
diff --git a/INSTALL b/INSTALL
index 447340ca..c72fbe11 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,5 +2,5 @@
 Please use
  python setup.py install
 
-and report errors to Salvatore Mesoraca (salvatore.mesoraca@aiven.io)
+and report errors to via https://github.com/valkey-io/valkey-py/issues/new