diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config
new file mode 100644
index 0000000000..a4db06e849
--- /dev/null
+++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config
@@ -0,0 +1 @@
+#FIRMWARE_RELEASE_STATUS="default"
diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
similarity index 71%
rename from packages/tools/rpi-eeprom/config/rpi-eeprom-update
rename to packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
index 0a62ac0b4a..0469c30add 100644
--- a/packages/tools/rpi-eeprom/config/rpi-eeprom-update
+++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
@@ -2,3 +2,7 @@
 FIRMWARE_ROOT="/usr/lib/kernel-overlays/base/lib/firmware/raspberrypi/bootloader"
 FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup"
 BOOTFS=${BOOTFS:-/flash}
+
+if [ -f /storage/.config/rpi-eeprom-update ]; then
+  . /storage/.config/rpi-eeprom-update
+fi
diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk
index 13acca46a5..966080daf7 100644
--- a/packages/tools/rpi-eeprom/package.mk
+++ b/packages/tools/rpi-eeprom/package.mk
@@ -56,5 +56,9 @@ makeinstall_target() {
     cp -PRv ${PKG_BUILD}/rpi-eeprom-digest ${INSTALL}/usr/bin
 
   mkdir -p ${INSTALL}/etc/default
-    cp -PRv ${PKG_DIR}/config/* ${INSTALL}/etc/default
+    cp -PRv ${PKG_DIR}/config/rpi-eeprom-update-default ${INSTALL}/etc/default/rpi-eeprom-update
+
+  mkdir -p ${INSTALL}/usr/config
+    cp -PRv ${PKG_DIR}/config/rpi-eeprom-update-config ${INSTALL}/usr/config/rpi-eeprom-update
+
 }