diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3424017ac..aeae61177 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: "bug"
+assignees: ""
 ---
 
 <!-- Before filing a bug please check the following: -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c59779518..d4fe1b2ed 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,4 @@
+blank_issues_enabled: false
 contact_links:
   - name: Translation bug
     url: https://github.com/progit/progit2/blob/master/TRANSLATING.md
diff --git a/.github/ISSUE_TEMPLATE/enhancement_idea.md b/.github/ISSUE_TEMPLATE/enhancement_idea.md
new file mode 100644
index 000000000..c1a8a0b32
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement_idea.md
@@ -0,0 +1,15 @@
+---
+name: Enhancement idea
+about: Suggest an idea for the ProGit2 book or repository
+title: ""
+labels: "enhancement"
+assignees: ""
+---
+
+**Give a general overview of your idea.**
+
+**Explain what problem you're trying to solve.**
+
+**Have you thought about other solutions?**
+
+**Do you want to help with this enhancement idea?**