diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 661490a01b2e8956f2d431e620ed13a19666917b..372c9a649ea3123c2d897d5d13122b7066ab6eaa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,5 +19,5 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Extras**
+**Additional**
 If the bug is difficult to explain, additionally to the text please include images and videos.
diff --git a/.github/ISSUE_TEMPLATE/problem-upgrading-the-firmware.md b/.github/ISSUE_TEMPLATE/problem-upgrading-the-firmware.md
new file mode 100644
index 0000000000000000000000000000000000000000..24caffe64142cc2a952187e4a2fbc08d2fce425a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/problem-upgrading-the-firmware.md
@@ -0,0 +1,20 @@
+---
+name: Problem upgrading the firmware
+about: Deal with the firmware upgrade problems
+title: Problem upgrading the firmware
+labels: ''
+assignees: ''
+
+---
+
+**What is happening?**
+Describe here why you are unable to upgrade the firmware. Before describing your problems, please read: https://github.com/eried/portapack-havoc/wiki/Update-firmware.
+
+**Were you able to update the firmware before?**
+Things might be confusing the first time, please check the video available on the link above if this is your first time.
+
+**Can you try the upgrade with a different PC/Portapack/HackRF?**
+If is possible, swap hardware and try again. Also, try different USB cables, even if the one you are using works fine for other purposes.
+
+**Additional**
+Add photos and videos of your procedure.