diff --git a/src/etc/rc.initial.firmware b/src/etc/rc.initial.firmware
index c68587394..837f28e2e 100755
--- a/src/etc/rc.initial.firmware
+++ b/src/etc/rc.initial.firmware
@@ -44,6 +44,7 @@ echo
 # upgrade all packages if possible
 pkg upgrade -y
 pkg autoremove -y
+pkg clean -y
 
 echo
 
diff --git a/src/opnsense/scripts/pkg_upgrade.sh b/src/opnsense/scripts/pkg_upgrade.sh
index 67cf3a95b..244901721 100755
--- a/src/opnsense/scripts/pkg_upgrade.sh
+++ b/src/opnsense/scripts/pkg_upgrade.sh
@@ -42,6 +42,7 @@ if [ -z "$pkg_running" ]; then
 		# update all installed packages
 		pkg upgrade -y >> ${PKG_PROGRESS_FILE}
 		pkg autoremove -y >> ${PKG_PROGRESS_FILE}
+		pkg clean -y >> ${PKG_PROGRESS_FILE}
 		# restart the web server
 		/usr/local/etc/rc.restart_webgui >> ${PKG_PROGRESS_FILE}
 		# if we can update base, we'll do that as well