diff --git a/recovery/boot.conf b/recovery/boot.conf
index feb0b19..36c1165 100644
--- a/recovery/boot.conf
+++ b/recovery/boot.conf
@@ -3,8 +3,8 @@ BOOT_UART=0
 WAKE_ON_GPIO=1
 POWER_OFF_ON_HALT=0
 
-# Try  SD- > USB PCIe MSD -> USB 2.0 BCM XHCI -> Network ->  Loop
-BOOT_ORDER=0xf2541
+# Try SD first (1), followed by, USB PCIe, NVMe PCIe, USB SoC XHCI then network
+BOOT_ORDER=0xf25641
 
 # Set to 0 to prevent bootloader updates from USB/Network boot
 # For remote units EEPROM hardware write protection should be used.
diff --git a/recovery/pieeprom-2021-07-06.bin b/recovery/pieeprom-2021-07-06.bin
new file mode 100644
index 0000000..c93ece1
--- /dev/null
+++ b/recovery/pieeprom-2021-07-06.bin
diff --git a/recovery/pieeprom.bin b/recovery/pieeprom.bin
index bf20065..3de4c98 100644
--- a/recovery/pieeprom.bin
+++ b/recovery/pieeprom.bin
diff --git a/recovery/pieeprom.original.bin b/recovery/pieeprom.original.bin
old mode 100644
new mode 100755
index c93ece1..6f21e0c
--- a/recovery/pieeprom.original.bin
+++ b/recovery/pieeprom.original.bin
diff --git a/recovery/pieeprom.sig b/recovery/pieeprom.sig
index 8b83917..d27a79e 100644
--- a/recovery/pieeprom.sig
+++ b/recovery/pieeprom.sig
@@ -1,2 +1,2 @@
-68086076eca7de8f9d9041e43525f19e21e78dcf5db3a30210068cc21e184e19
-ts: 1626189116
+b6ad7f2f65320eec7fb851c4ec8eebd085010acd3c83dbbb7cea332f5076cfd7
+ts: 1638293518
diff --git a/tools/rpi-eeprom-config b/tools/rpi-eeprom-config
index 09af204..2eaf252 100755
--- a/tools/rpi-eeprom-config
+++ b/tools/rpi-eeprom-config
@@ -140,9 +140,13 @@ def apply_update(config, eeprom=None, config_src=None):
     else:
         eeprom_image = get_latest_eeprom()
     create_tempdir()
+
+    # Replace the contents of bootconf.txt with the contents of the config file
     tmp_update = os.path.join(TEMP_DIR, 'pieeprom.upd')
     image = BootloaderImage(eeprom_image, tmp_update)
-    image.write(config)
+    image.update_file(config, BOOTCONF_TXT)
+    image.write()
+
     config_str = open(config).read()
     if config_src is None:
         config_src = ''
@@ -176,7 +180,7 @@ def edit_config(eeprom=None):
     if os.path.exists(pending):
         config_src = pending
         image = BootloaderImage(pending)
-        current_config = image.get_config().decode('utf-8')
+        current_config = image.get_file(BOOTCONF_TXT).decode('utf-8')
     else:
         current_config, config_src = read_current_config()