diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 2d42bb11..50a401b1 100755
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,6 +7,11 @@ about: Create a bug report to help us enhance our images
 
 **Short overview**
 
+**Issue occurs on**
+- [ ] Virtual machine
+- [ ] Docker container
+- [ ] Dev/Host system
+
 **Detailed error description**
 
 **Steps to reproduce error**
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index d567ccd6..76b9c562 100755
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -5,4 +5,10 @@ about: File a request to resolve open questions
 
 **Short summary**
 
+**Desired execution environment / tested on**
+- [ ] Virtual machine
+- [ ] Docker container
+- [ ] Dev/Host system
+
+
 **Detailed question**
\ No newline at end of file