diff --git a/packages/base/all/vendor-config-onl/src/boot.d/60.upgrade-onie b/packages/base/all/vendor-config-onl/src/boot.d/60.upgrade-onie
index 540e24d3..548193d0 100755
--- a/packages/base/all/vendor-config-onl/src/boot.d/60.upgrade-onie
+++ b/packages/base/all/vendor-config-onl/src/boot.d/60.upgrade-onie
@@ -1 +1,6 @@
+if policy=$(/usr/bin/onl-sysconfig upgrade.onie.bootd); then
+   if [ "$policy" = "disabled" ]; then
+      exit 0
+   fi
+fi
 /sbin/onl-upgrade-onie
diff --git a/packages/base/all/vendor-config-onl/src/boot.d/61.upgrade-firmware b/packages/base/all/vendor-config-onl/src/boot.d/61.upgrade-firmware
index 41880e16..32c86c46 100755
--- a/packages/base/all/vendor-config-onl/src/boot.d/61.upgrade-firmware
+++ b/packages/base/all/vendor-config-onl/src/boot.d/61.upgrade-firmware
@@ -1,2 +1,6 @@
+if policy=$(/usr/bin/onl-sysconfig upgrade.firmware.bootd); then
+   if [ "$policy" = "disabled" ]; then
+      exit 0
+   fi
+fi
 /sbin/onl-upgrade-firmware
-