diff --git a/src/etc/rc.syshook.d/update/10-refresh.sh b/src/etc/rc.syshook.d/update/10-refresh.sh
index f1e368a2c..b27145939 100755
--- a/src/etc/rc.syshook.d/update/10-refresh.sh
+++ b/src/etc/rc.syshook.d/update/10-refresh.sh
@@ -4,4 +4,4 @@
 /usr/local/etc/rc.configure_firmware
 
 # background the cleanup job to avoid blocking
-daemon /usr/local/etc/rc.syshook.d/upgrade/90-cleanup.sh
+daemon -f opnsense-update -Fs
diff --git a/src/etc/rc.syshook.d/upgrade/90-cleanup.sh b/src/etc/rc.syshook.d/upgrade/90-cleanup.sh
index 83122d672..87ede7f8a 100755
--- a/src/etc/rc.syshook.d/upgrade/90-cleanup.sh
+++ b/src/etc/rc.syshook.d/upgrade/90-cleanup.sh
@@ -1,14 +1,4 @@
 #!/bin/sh
 
-# remove our stale pyc files not handled by pkg
-find /usr/local/opnsense -type f -name "*.pyc" -delete
-
-for DIR in /boot /usr/libexec/bsdinstall /usr/local; do
-	# remove spurious files from pkg
-	find ${DIR} ! \( -type d \) -a \
-	    \( -name "*.pkgsave" -o -name ".pkgtemp.*" \) -delete
-
-        # processs spurious directories from pkg
-        # (may not be empty so -delete does not work)
-	find ${DIR} -type d -name ".pkgtemp.*" -print0 | xargs -0 -n1 rm -r
-done
+# run a cleanup beforehand to avoid later pkg-upgrade failures
+opnsense-update -Fs
diff --git a/src/opnsense/scripts/firmware/upgrade.sh b/src/opnsense/scripts/firmware/upgrade.sh
index 34733710f..c4c641ba2 100755
--- a/src/opnsense/scripts/firmware/upgrade.sh
+++ b/src/opnsense/scripts/firmware/upgrade.sh
@@ -49,7 +49,7 @@ if opnsense-update -u > ${PIPEFILE} 2>&1; then
 	fi
 
 	# abort pending upgrades
-	opnsense-update -e >> ${LOCKFILE} 2>&1
+	opnsense-update -es >> ${LOCKFILE} 2>&1
 fi
 
 echo '***DONE***' >> ${LOCKFILE}
diff --git a/src/opnsense/service/conf/actions.d/actions_firmware.conf b/src/opnsense/service/conf/actions.d/actions_firmware.conf
index cd116f02b..ae443ced4 100644
--- a/src/opnsense/service/conf/actions.d/actions_firmware.conf
+++ b/src/opnsense/service/conf/actions.d/actions_firmware.conf
@@ -30,7 +30,7 @@ type:script_output
 message:Requesting firmware upgrade log
 
 [log.clear]
-command:/usr/local/sbin/opnsense-update -e
+command:/usr/local/sbin/opnsense-update -es
 parameters:
 type:script
 message:Clearing firmware upgrade log