diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index ba09052..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-Because we focus purely on integrating the Elastic stack using Docker and not on the individual stack components themselves, we kindly ask our users to submit questions about Elastic products in the Elastic Discussion Forums @ https://discuss.elastic.co/.
-
-General questions regarding this project can be asked in the docker-elk Gitter chat room @ https://gitter.im/deviantony/docker-elk.
--->
-
-### Problem description
-
-<!-- Be as descriptive as possible regarding the encountered issue versus the expected outcome. -->
-
-### Extra information
-
-<!-- Please include the following information in your issue report. -->
-
-#### Stack configuration
-
-<!-- Detail all performed configuration changes, including to Dockerfiles. -->
-
-#### Docker setup
-
-```
-<!-- Replace this comment with the full output of the `docker version` command. -->
-```
-
-```
-<!-- Replace this comment with the full output of the `docker-compose version` command. -->
-```
-
-#### Docker logs
-
-```
-<!-- Replace this comment with the full output of the `docker-compose logs` command. -->
-```
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..42d723d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+- name: Discuss the Elastic Stack
+  url: https://discuss.elastic.co
+  about: Please ask questions related to the usage of Elastic products in those forums.
+- name: Docker Community Forums
+  url: https://forums.docker.com
+  about: Please ask questions related to the usage of Docker products in those forums.
+- name: docker-elk Gitter chat room
+  url: https://gitter.im/deviantony/docker-elk
+  about: General questions regarding this project can also be asked in the chat.
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
new file mode 100644
index 0000000..2d0841d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -0,0 +1,87 @@
+---
+name: Issue report
+about: Report a problem with the docker-elk integration or its documentation.
+---
+
+<!--
+Thanks for your issue report!
+
+In order for us to be able to reproduce the problem and identify the root cause
+quickly, we kindly ask you to include *all* the information requested below in
+your issue report. It saves us a lot of effort and allows us to provide you
+with a solution with as little delay as possible.
+
+Issues submitted without the requested information will be closed.
+Thank you for your understanding.
+-->
+
+
+### Problem description
+
+<!--
+Please be as descriptive as possible regarding the encountered issue versus the
+expected outcome.
+-->
+
+### Extra information
+
+#### Stack configuration
+
+<!--
+Please mention all changes performed to the default configuration, including to Dockerfiles.
+If possible, provide the output of the `git diff` command.
+-->
+
+#### Docker setup
+
+<!--
+Please paste the full output of the `docker version` command below.
+
+Example:
+
+Client: Docker Engine - Community
+ Version:           20.10.2
+ API version:       1.41
+ ...
+-->
+
+```console
+$ docker version
+
+[OUTPUT HERE]
+```
+
+<!--
+Please paste the full output of the `docker-compose version` command below.
+
+Example:
+
+docker-compose version 1.27.4, build 40524192
+docker-py version: 4.3.1
+...
+-->
+
+```console
+$ docker-compose version
+
+[OUTPUT HERE]
+```
+
+#### Container logs
+
+<!--
+Please paste the full output of the `docker-compose logs` command below.
+
+Example:
+
+elasticsearch_1  | Created elasticsearch keystore in /usr/share/elasticsearch/config/elasticsearch.keystore
+elasticsearch_1  | {"@timestamp":"2021-01-16T21:53:38.331Z", "log.level": "INFO", "message":"version...
+kibana_1         | {"type":"log","@timestamp":"2021-01-16T21:54:10+00:00","tags":["info","plugins-system"],...
+...
+-->
+
+```console
+$ docker-compose logs
+
+[OUTPUT HERE]
+```