diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 77%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 7e02a280614..74b8d83dfb3 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,13 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
-[//]: # "Please remove these comments"
-[//]: # "Provide a general summary of the issue in the Title above"
+---
 
 ## Environment Details
 * Helidon Version:
 * Helidon SE or Helidon MP
 * JDK version:
 * OS:
-* Docker version (if applicable):
 
 ----------
 
@@ -20,3 +24,4 @@
 [//]: # "Step by step instructions to reproduce the problem"
 [//]: # "Provide sample code/application if relevant"
 
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..3ba13e0cec6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false