diff --git a/plist b/plist
index ea3f73cc2..31d5b95ba 100644
--- a/plist
+++ b/plist
@@ -125,7 +125,7 @@
 /usr/local/etc/rc.syshook.d/backup/20-netflow
 /usr/local/etc/rc.syshook.d/backup/20-rrd
 /usr/local/etc/rc.syshook.d/carp/20-openvpn
-/usr/local/etc/rc.syshook.d/early/05-update
+/usr/local/etc/rc.syshook.d/early/05-upgrade
 /usr/local/etc/rc.syshook.d/early/10-configd
 /usr/local/etc/rc.syshook.d/early/15-templates
 /usr/local/etc/rc.syshook.d/early/20-backup
diff --git a/src/etc/rc.syshook.d/early/05-update b/src/etc/rc.syshook.d/early/05-update
deleted file mode 100755
index a568575f3..000000000
--- a/src/etc/rc.syshook.d/early/05-update
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Perform major updates
-
-# reroot only when we swapped the base files
-if opnsense-update -B; then reboot -r; fi
-
-# reboot fully to start up including boot screen
-if opnsense-update -P; then reboot; fi
diff --git a/src/etc/rc.syshook.d/early/05-upgrade b/src/etc/rc.syshook.d/early/05-upgrade
new file mode 100755
index 000000000..05446c634
--- /dev/null
+++ b/src/etc/rc.syshook.d/early/05-upgrade
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Perform major updates
+
+for STAGE in B P; do
+       if opnsense-update -${STAGE}; then
+               reboot
+       fi
+done