diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e6a189e..76136f6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,6 @@ This repository tracks bugs for the Raspberry Pi 4 bootloader EEPROM and Linux u
 * If you suspect a hardware problem then please read the [Boot Problems](https://www.raspberrypi.org/forums/viewtopic.php?p=437084) post first before contacting the reseller.
 * Support questions or should be posted on the Raspberry Pi [General Discussion](https://www.raspberrypi.org/forums/viewforum.php?f=63)**
 
-
 **Mandatory information**
 * Raspberry Pi model
 * Board revision (cat /proc/cpuinfo | grep Revision)
@@ -27,21 +26,35 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Bootloader version and configuration**
-If you have modified the default bootloader release or configuration then please attach the bootloader configuration vcgencmd bootloader_config and version (vcgencmd bootloader_version)
+Please include the bootloader version and config.
+```bash
+vcgencmd bootloader_version
+vcgencmd bootloader_config
+```
 
 **SD card boot (please complete the following information):**
  - SD card type
  - Partition information (sudo fdisk -l) if you are able to obtain this from another computer.
 
+**USB boot (please complete the following information):**
+Verify that the the USB device works correctly when hot-plugged under Linux and attache the output of 'lsusb -vvv'
+
 **Network boot (please complete the following information):**
 Network boot bug normally require one or more of the following log types. [PiServer](https://github.com/raspberrypi/piserver) is the officially supported network boot server.
 
  - DHCP server configuration files e.g. dnsmasq.conf
  - Wireshark binary packet capture
- - UART logs
+ - UART logs with `uart_2ndstage=1` set in `config.txt`
 
 **USB boot (please complete the following information):**
-Verify that the the USB device works correctly when hot-plugged under Linux and attache the output of 'lsusb -vvv'
+Boot from SD/EMMC then capture the following information about the NVme device.
+```bash
+sudo apt-get install nvme-cli
+sudo nvme list
+sudo nvme id-ctrl -H /dev/nvme0
+sudo nvme list-ns /dev/nvme0
+sudo nvme id-ns -H /dev/nvme0 --namespace-id=1
+```
 
 **Additional context**
 Add any other context about the problem here.