diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 000000000..bcc24ccd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,54 @@
+---
+name: Bug Report
+about: Report a bug in the Neo4j Python Driver
+labels: "bug"
+---
+
+<!--
+    If you are an Enterprise customer, you might want to head over to our
+    [Customer Support Portal](https://support.neo4j.com/).
+-->
+
+<!--
+    If you are unsure about the usage of the driver, this issue tracker is not
+    the right place to ask. Please use one of the following channels instead:
+
+    - Neo4j Online Community: https://community.neo4j.com/
+    - StackOverflow: https://stackoverflow.com/questions/tagged/neo4j+python
+    - Discord: https://discord.gg/neo4j
+    - Neo4j Support Portal if you are an enterprise customer:
+      https://support.neo4j.com/
+
+    or check the documentation:
+
+    - API documentation: https://neo4j.com/docs/api/python-driver/current/
+    - Driver manual: https://neo4j.com/docs/python-manual/current/
+-->
+
+<!--
+    Make sure you've searched the issue tracker for similar issues first.
+-->
+
+
+# Bug Report
+<!-- description of the found bug -->
+
+<!--
+    Information to include:
+
+    Often, driver debug logs go a long way.
+    See https://neo4j.com/docs/api/python-driver/current/api.html#logging on
+    how to enable them.
+
+    Also, **full** stacktraces are very helpful if Exceptions are involved.
+
+    A minimal reproducer if possible
+    https://stackoverflow.com/help/minimal-reproducible-example
+-->
+
+
+# My Environment
+Python Version: <!-- output of `python -VV` -->
+Driver Version: <!-- can be found with `python -m pip show neo4j` -->
+Server Version and Edition: <!-- e.g., Neo4j 4.4.3 enterprise cluster -->
+Operating System: <!-- e.g., Windows 10, Ubuntu 18.04, macOS 10.15 -->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 000000000..c3c1f81e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an idea for the Neo4j Python Driver
+labels: "feature request"
+---
+
+# Feature Request
+<!-- a brief description of what's requested -->
+
+# Pitch
+<!-- elaborate on the feature request and why it would be beneficial -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..71ede9d82
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,33 @@
+<!--
+    Thanks for making the effort to create a Pull Request!
+    Please read the comment in its entirety fist.
+
+    If you haven't already, please sign our Contributor License Agreement at
+    https://neo4j.com/developer/cla/
+    Commits from accounts that have not signed the CLA will fail the CI and
+    will not be reviewed. If you are a first-time contributor and have just
+    signed the CLA, please include a note about this in the PR comment as some
+    manual steps from our side are required.
+-->
+
+<!--
+    Title:
+
+    PRs targeting the current default branch (nightly driver) don't follow a
+    fixed naming scheme.
+
+    If your PR is a backport, please use the following naming scheme:
+
+    [targeted version] description
+
+    e.g.,
+
+    [4.4] Remove a banana from the code
+-->
+
+<!--
+    Description:
+
+    Please include a summary of the changes in this PR and their purpose.
+    Link any related issues or PRs.
+-->
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 387929f06..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,48 +0,0 @@
-## Guidelines
-
-Firstly, if you are an Enterprise customer, you might want to head over to our [Customer Support Portal](https://support.neo4j.com/).
-
-If you think you might have **hit a bug** in our software (it happens occasionally!) or you have specific **feature request** then use the issue feature on the relevant GitHub repository.
-Check first though as someone else may have already raised something similar.
-
-If you simply want to get started or have a question on how to use a particular feature, ask a question in [Neo4j Online Community](https://community.neo4j.com/) instead.
-[StackOverflow](https://stackoverflow.com/questions/tagged/neo4j) also hosts a ton of questions and might already have a discussion around your problem.
-Make sure you have a look there too.
-
-If you want to make a feature request, please prefix your issue title with `[Feature Request]` so that it is clear to us.
-If you have a bug report however, please continue reading.  
-To help us understand your issue, please specify important details, primarily:
-
-- Neo4j version: Community/Enterprise X.Y.Z
-- Neo4j Mode: Single instance/HA cluster with X members/Casual cluster with X core Y read-replica
-- Driver version: X lanaguage driver X.Y.Z (If you use some other library that wraps around this driver, you might want to raise an issue there first)
-- Operating system: (for example Windows 10/Ubuntu 16.10 on AWS)
-- **Steps to reproduce**
-- Expected behavior
-- Actual behavior
-
-Additionally, include (as appropriate) log-files, stacktraces, and other debug output.
-Always check the server logs to see if there is any stacktrace related to the driver error too.
-Aslo add any solutions you've tried to solve the problem yourself.
-
-## Example bug report
-
-I got connection reset by peer errors.
-
-**Neo4j Version:** 3.4.10 Community  
-**Neo4j Mode**: Single instance  
-**Driver version**: Python driver 1.7.1  
-**Operating System:** Ubuntu 16.10 on AWS  
-
-### Steps to reproduce
-1. Start Neo4j on a AWS instance
-2. Run a query with the driver
-3. Put the driver idle for 2h
-4. Run another query
-### Expected behavior
-The second query shall run successfully
-### Actual behavior
-The client failed to run the second query with a `connection reset by peer` stacktrace.  
-*attach the stacktrace*  
-Meanwhile, in the server log, I found this stacktrace that happened at the same time when the driver failed.  
-*attach the stacktrace*