diff --git a/src/etc/rc.syshook.d/early/05-update b/src/etc/rc.syshook.d/early/05-update
index 197a75271..0143a33ec 100755
--- a/src/etc/rc.syshook.d/early/05-update
+++ b/src/etc/rc.syshook.d/early/05-update
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 # Perform major updates
-for STAGE in B P; do
-	if opnsense-update -${STAGE}; then
-		# ideally reroot with `-r', but panics on ZFS
-		reboot
-	fi
-done
+
+if opnsense-update -B; then
+	reboot -r
+fi
+
+if opnsense-update -P; then
+	# XXX omit eventually?
+	reboot
+fi