diff --git a/recovery/boot.conf b/recovery/boot.conf
index 8988878..feb0b19 100644
--- a/recovery/boot.conf
+++ b/recovery/boot.conf
@@ -2,8 +2,11 @@
 BOOT_UART=0
 WAKE_ON_GPIO=1
 POWER_OFF_ON_HALT=0
-# Disable bootloader updates from USB MSD & network.
-ENABLE_SELF_UPDATE=0
-# SD, PCIe USB MSD, BCM2711 USB MSD, LOOP
-BOOT_ORDER=0xf541
+
+# Try  SD- > USB PCIe MSD -> USB 2.0 BCM XHCI -> Network ->  Loop
+BOOT_ORDER=0xf2541
+
+# Set to 0 to prevent bootloader updates from USB/Network boot
+# For remote units EEPROM hardware write protection should be used.
+ENABLE_SELF_UPDATE=1
 
diff --git a/recovery/pieeprom-2021-01-16.bin b/recovery/pieeprom-2021-02-16.bin
index 72ca170..7413a3f 100644
--- a/recovery/pieeprom-2021-01-16.bin
+++ b/recovery/pieeprom-2021-02-16.bin
diff --git a/recovery/pieeprom.bin b/recovery/pieeprom.bin
index 8400558..ba47bec 100644
--- a/recovery/pieeprom.bin
+++ b/recovery/pieeprom.bin
diff --git a/recovery/pieeprom.original.bin b/recovery/pieeprom.original.bin
new file mode 100644
index 0000000..7413a3f
--- /dev/null
+++ b/recovery/pieeprom.original.bin
diff --git a/recovery/pieeprom.original.bin b/recovery/pieeprom.original.bin
deleted file mode 120000
index ac1540f..0000000
--- a/recovery/pieeprom.original.bin
+++ /dev/null
@@ -1 +0,0 @@
-pieeprom-2021-01-16.bin
\ No newline at end of file
diff --git a/recovery/pieeprom.sig b/recovery/pieeprom.sig
index b8486c2..6d26b2c 100644
--- a/recovery/pieeprom.sig
+++ b/recovery/pieeprom.sig
@@ -1,2 +1,2 @@
-4fe4dee06b4401da28cec09c9bae1ab76b7994525f4e5c36a06adb9a2ffb5429
-ts: 1610965456
+7366fe0280171924edfd8daf5d73688041d309a70583bb94513566b189422af2
+ts: 1614941004
diff --git a/win32/rpiboot_setup.exe b/win32/rpiboot_setup.exe
index 9b4cd27..2274d24 100755
--- a/win32/rpiboot_setup.exe
+++ b/win32/rpiboot_setup.exe