diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE/bugreport.md
similarity index 57%
rename from .github/ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE/bugreport.md
index 7291b654488e21a5d87f923c13d4b5833e714cae..03cb63cb7d0627bb75e3737d0d5fe63bdaae7b2c 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE/bugreport.md
@@ -1,9 +1,14 @@
+---
+name: Bug Report
+about: Use this template for reporting Bugs
+---
+
 !!!IMPORTANT!!!: To facilitate faster and easier response to your issue please provide in addition to the description of the issue also the following information
 
- - OS version: e.g. SLC6
- - Compiler version: e.g GCC 6.2
- - DD4hep version: tag or commit ID, or GitHub branch
- - Reproduced by: exact steps to reproduce the problem: checkout, setup environment (Geant, ROOT versions, iLCSoft release), cmake, build, run...
+ - OS version: e.g. centos7
+ - Compiler version: e.g GCC 8.0
+ - Package version: tag or commit ID, or GitHub branch
+ - Reproduced by: exact steps to reproduce the problem: checkout, setup environment (Geant4/ROOT version, LCG/iLCSoft/Key4hep release), cmake, build, run...
  - Input: link to input files if applicable
  - Output: full build and run log output
  - Goal: A short description of what you are trying to achieve
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 0000000000000000000000000000000000000000..907f18a7b713db1075b700401073da8eefa72449
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,6 @@
+---
+name: New Feature
+about: Use this template for proposing new features
+labels: enhancement
+---
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000000000000000000000000000000000000..01a606ac168d9363a7ee734404edced2a04d3a49
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,5 @@
+---
+name: Question
+about: Use this template for asking questions about the functionality of DD4hep
+labels: question
+---