diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index cbe5ab40..a209ccc9 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,6 +1,6 @@
 ---
-name: 📝 Questions / Documentation
-about: General questions or sections we should improve in the documentation?
+name: 📝 Documentation
+about: Anything related to the Devilbox documentation
 
 ---
 
@@ -10,16 +10,15 @@ about: General questions or sections we should improve in the documentation?
 2. Fill out all required information below, otherwise it might take more time to properly handle this bug
 -->
 
-<!--
-Find the Documentation here: https://readthedocs.org/projects/devilbox/
--->
-
 #### ISSUE TYPE
 <!-- DO NOT CHANGE THIS -->
  - Documentation
 
 
 #### SUMMARY
-<!-- Explain your question or missing documentation -->
-<!-- Explain what is wrong in the documentation and how it should be -->
+<!-- 
+Find the Documentation here: https://readthedocs.org/projects/devilbox/
+
+Explain what is missing or wrong in the documentation and how it should be
+-->
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..3c11c016
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,26 @@
+---
+name: ❔ Question
+about: General question
+
+---
+
+<!---
+1. Verify first that your issue/request is not already reported on GitHub.
+
+2. Fill out all required information below, otherwise it might take more time to properly handle this bug
+-->
+
+
+#### ISSUE TYPE
+<!-- DO NOT CHANGE THIS -->
+ - Question
+
+
+#### SUMMARY
+<!--
+Ensure your question is not already covered by the documentation:
+https://readthedocs.org/projects/devilbox/
+
+Explain your question in detail below
+-->
+