diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e6a189e..5fbe134 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,24 +26,38 @@ 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 boot (please complete the following information):**  
  - SD card type
  - Partition information (sudo fdisk -l) if you are able to obtain this from another computer.
 
-**Network boot (please complete the following information):**
+**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'
+**NVMe boot (please complete the following information):**
+
+```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. 
 
-The [Bootloader configuration](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md) page describes how to enable UART or NETCONSOLE logs. For complex USB boot issues NETCONSOLE logs are recommended.
+The [Bootloader configuration](https://www.raspberrypi.org/documentation/computers/raspberry-pi.html#raspberry-pi-4-bootloader-configuration) page describes how to enable UART or NETCONSOLE logs. For complex USB boot issues NETCONSOLE logs are recommended.
 
diff --git a/firmware/beta/recovery.bin b/firmware/beta/recovery.bin
index 970fe93..8ed379e 100644
Binary files a/firmware/beta/recovery.bin and b/firmware/beta/recovery.bin differ
diff --git a/firmware/release-notes.md b/firmware/release-notes.md
index b6351a6..d4bc11a 100644
--- a/firmware/release-notes.md
+++ b/firmware/release-notes.md
@@ -3,6 +3,10 @@
 USB MSD boot also requires the firmware from Raspberry Pi OS 2020-08-20 or newer.
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
 
+## 2021-09-22 - Update recovery.bin to fix issue with large FAT partitions - BETA
+  * Fix an issue where the ROM fails to load larger recovery.bin files
+    on FAT partitions with large cluster sizes.
+
 ## 2021-07-07 - Promote pieeprom-2021-07-06 to stable - STABLE
   * Promote the latest beta to stable. For CM4 users this adds NVMe
     boot support to the stable release.
@@ -51,7 +55,7 @@ https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloade
    * UDP checksum fixes
    * Add support for the BCM2711 XHCI controller - BOOT_ORDER 0x5
    * XHCI protocol layer fixes for non-VLI controllers
-   * Avoid USB MSD timeout of there is only one device
+   * Avoid USB MSD timeout if there is only one device
    * Implement tryboot for OS upgrade fallback
    * Check the update-timestamp before applying an update in SELF-UPDATE mode