diff --git a/pepscripts/07final-cleanup b/pepscripts/07final-cleanup
index 0fd1268..7210c76 100755
--- a/pepscripts/07final-cleanup
+++ b/pepscripts/07final-cleanup
@@ -4,11 +4,10 @@
 #
 # SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
 
-# This script copies a file to the chroot and runs commands during the Debian installation process.
+# This script removes unwanted software after Debian installation.
 
-# Remove unwanted software
-
-chroot /target apt --purge  autoremove \
+# Remove unwanted packages
+apt purge --autoremove -y \
     quassel \
     thunderbird \
     mpv \
@@ -17,4 +16,13 @@ chroot /target apt --purge  autoremove \
     audacious \
     connman \
     deluge \
-    galculator \
+    galculator
+
+# Clear package cache
+apt clean
+
+# Update system packages
+apt update
+
+# Upgrade system packages
+apt upgrade -y
diff --git a/pepscriptsdev/07final-cleanup b/pepscriptsdev/07final-cleanup
index 0fd1268..7210c76 100755
--- a/pepscriptsdev/07final-cleanup
+++ b/pepscriptsdev/07final-cleanup
@@ -4,11 +4,10 @@
 #
 # SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
 
-# This script copies a file to the chroot and runs commands during the Debian installation process.
+# This script removes unwanted software after Debian installation.
 
-# Remove unwanted software
-
-chroot /target apt --purge  autoremove \
+# Remove unwanted packages
+apt purge --autoremove -y \
     quassel \
     thunderbird \
     mpv \
@@ -17,4 +16,13 @@ chroot /target apt --purge  autoremove \
     audacious \
     connman \
     deluge \
-    galculator \
+    galculator
+
+# Clear package cache
+apt clean
+
+# Update system packages
+apt update
+
+# Upgrade system packages
+apt upgrade -y