diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 39cd2cd67..10e35f39b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Report a bug encountered while running Louketo
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!-- 
 Please use this template when submitting a new bug report with as much details as possible. Not doing so may result in the issue not being addressed in a timely manner or eventually closed.
 -->
@@ -44,5 +53,3 @@ All the detailed steps required to reproduce the issue
 <!-- 
 Any additional information that you believe worth mentioning
 -->
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bd5ced786..70fae70d5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,3 +1,12 @@
+---
+name: Feature request
+about: Suggest a feature to the Louketo Proxy project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!-- 
 Please use this template when submitting a new feature request with as much details as possible. Not doing so may result in the issue not being addressed in a timely manner or eventually closed.
 -->
@@ -34,5 +43,3 @@ What are the conditions that the implementation must meet to be considered accep
 <!-- 
 Any additional information that you believe worth mentioning
 -->
-
-