diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 3305f8e05f171e96a92b9c54786495b77c12c804..25824a5efa393547f35f6386296121c44b2663d9 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,12 +1,7 @@
-* **I'm submitting a ...**
-  - [ ] bug report
-  - [ ] feature request
-  - [ ] support request => Please do not submit support request here, see note at the top of this template.
-
-
-* **Do you want to request a *feature* or report a *bug*?**
-
-
+---
+name: Bug Report
+about: Report a bug with the container / image
+---
 
 * **What is the current behavior?**
 
diff --git a/.github/ISSUE_TEMPLATE/pull_request.md b/.github/ISSUE_TEMPLATE/pull_request.md
index 7f4f82add6a6010dd9f70b27906795920fa4c3b9..9ba36a2c7bc2deb3c4d67b423605edbd9c5fa795 100644
--- a/.github/ISSUE_TEMPLATE/pull_request.md
+++ b/.github/ISSUE_TEMPLATE/pull_request.md
@@ -1,3 +1,8 @@
+---
+name: Pull Request
+about: Pull request for a change / addition / fix you made to the repository.
+---
+
 * **Please check if the PR fulfills these requirements**
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)