diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
new file mode 100644
index 000000000..54f0475f7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -0,0 +1,76 @@
+---
+name: Bug Report
+about: Report a problem with HAProxy to help us resolve it.
+labels: 'type: bug, status: needs-triage'
+---
+
+<!--
+
+Welcome! - We kindly ask that you:
+
+  1. Fill out the issue template below - not doing so needs a good reason.
+  2. Use the forum or the mailing list if you have a question rather than a bug or feature request.
+
+The forum is at: https://discourse.haproxy.org/
+
+The mailing list (no need to subscribe) is: haproxy@formilux.org
+Subscribe to the list: haproxy+subscribe@formilux.org
+Unsubscribe from the list: haproxy+unsubscribe@formilux.org
+
+Forum and mailing list are correct places for questions about HAProxy or general suggestions
+and topics, e.g. usage or documentation questions! This issue tracker is for tracking bugs and
+feature requests directly relating to the development of the software itself.
+
+Thanks for understanding, and for contributing to the project!
+
+-->
+
+## Output of `haproxy -vv` and `uname -a`
+
+<!-- Put it in code blocks ```: -->
+
+```
+(paste your output here)
+```
+
+## What's the configuration?
+
+<!--
+Include as much configuration as possible, including global and default sections.
+Replace confidential data like domain names and IP addresses.
+
+Put it in code blocks ```:
+-->
+
+```
+(paste your output here)
+```
+
+## Steps to reproduce the behavior
+
+<!--
+The more time you spend describing an easy way to reproduce the behavior (if
+this is possible), the easier it is for the project developers to fix it!
+-->
+
+1. 
+2. 
+3. 
+
+## Actual behavior
+
+<!--
+In this section, please try to concentrate on observations, so only describe
+what you observed directly.
+-->
+
+## Expected behavior
+
+<!--
+Describe what you would like HAProxy to do differently.
+-->
+
+## Do you have any idea what may have caused this?
+
+## Do you have an idea how to solve the issue?
+
diff --git a/.github/ISSUE_TEMPLATE/Feature.md b/.github/ISSUE_TEMPLATE/Feature.md
new file mode 100644
index 000000000..8f1a9dfba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature.md
@@ -0,0 +1,55 @@
+---
+name: Feature Request
+about: Suggest a new feature or enhancement for HAProxy.
+labels: 'type: feature'
+---
+
+<!--
+
+Welcome! - We kindly ask that you:
+
+  1. Fill out the issue template below - not doing so needs a good reason.
+  2. Use the forum or the mailing list if you have a question rather than a bug or feature request.
+
+The forum is at: https://discourse.haproxy.org/
+
+The mailing list (no need to subscribe) is: haproxy@formilux.org
+Subscribe to the list: haproxy+subscribe@formilux.org
+Unsubscribe from the list: haproxy+unsubscribe@formilux.org
+
+Forum and mailing list are correct places for questions about HAProxy or general suggestions
+and topics, e.g. usage or documentation questions! This issue tracker is for tracking bugs and
+feature requests directly relating to the development of the software itself.
+
+Thanks for understanding, and for contributing to the project!
+
+-->
+
+## Output of `haproxy -vv` and `uname -a`
+
+<!--
+Please add the output of haproxy -vv you are currently using here, this helps us
+later to see what has changed in HAProxy when we revisit this issue after some
+time.
+
+Put it in code blocks ```:
+-->
+
+```
+(paste your output here)
+```
+
+## What should haproxy do differently? Which functionality do you think we should add?
+
+<!--
+Please describe the feature you would like us to add here.
+-->
+
+
+## What are you trying to do?
+
+<!--
+This section should contain a brief description what you're trying to do, which
+would be possible after implementing the new feature.
+-->
+