diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0e78e1b6ea..31dc6643f1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,12 +6,8 @@ about: Create a report to help us improve
 
 ### *Product:* (OC-SDR, OC-LTE, OC-LTE, OC-Power, others)
       
-### *Category:*
-   - [ ] Hardware
-   - [ ] Software/stack
-   - [ ] Firmware/bootloader 
-   - [ ] Documentation
-
+### *Category:* (Hardware, Software/stack, Firmware/bootloader, Documentation)
+   
 **Describe the issue found**
 A clear and concise description of what you happened. 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 03bbb762a3..4cea114202 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -8,12 +8,8 @@ about: Suggest an idea/new feature for OpenCellular
    
 ### *Component:* (PSU, GBC, BBU, FEM, LED, ME)
    
-### *Category:*
-   - [ ] Hardware
-   - [ ] Software/stack
-   - [ ] Firmware/bootloader 
-   - [ ] Documentation
-
+### *Category:* (Hardware, Software/stack, Firmware/bootloader, Documentation)
+   
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen. Ex. Band28 FEM support for LTE [...]