diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 367d7e6..fd23d3b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,11 +7,11 @@ assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+**Describe**
+A concise description of what the bug is.
 
 **To Reproduce**
-How to reproduce the behavior - runtime flags used, env. variable values etc.
+Command and runtime flags used, env. variable values etc.
 
 **Console output or error log**
 If applicable, add screenshots or logs to help explain your problem.
@@ -19,5 +19,5 @@ If applicable, add screenshots or logs to help explain your problem.
 **Release number**
 Specify what version you are working with.
 
-**Additional context**
+**Additional**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 37d071b..6cb16d4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,11 +7,11 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+**SUMMARY**
 Ex. As a DevOps engineer, I would like to manage XY configuration [...]
 
-**Describe alternatives you've considered**
+**ALTERNATIVES**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+**ADDITIONAL CONTEXT**
 Add any other context or screenshots about the feature request here.