diff --git a/pepscripts/07-update-system b/pepscripts/07-update-system
new file mode 100644
index 0000000..4579112
--- /dev/null
+++ b/pepscripts/07-update-system
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
+
+# This script updates the system after Debian installation.
+
+# Update the system
+chroot /target apt update
+chroot /target apt upgrade -y
+
+# Clean up unnecessary packages
+chroot /target apt autoremove -y
diff --git a/pepscripts/07final-cleanup b/pepscripts/07final-cleanup
index 432ed33..47f7f8e 100755
--- a/pepscripts/07final-cleanup
+++ b/pepscripts/07final-cleanup
@@ -22,6 +22,3 @@ chroot /target apt purge --autoremove -y \
 
 # Clean unnecessary files
 rm -r /target/boot/firmware
-
-# system update 
-chroot /target apt update && apt upgrade -y
diff --git a/pepscriptsdev/07-update-system b/pepscriptsdev/07-update-system
new file mode 100644
index 0000000..4579112
--- /dev/null
+++ b/pepscriptsdev/07-update-system
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
+
+# This script updates the system after Debian installation.
+
+# Update the system
+chroot /target apt update
+chroot /target apt upgrade -y
+
+# Clean up unnecessary packages
+chroot /target apt autoremove -y
diff --git a/pepscriptsdev/07final-cleanup b/pepscriptsdev/07final-cleanup
index 513aeef..08bbd9c 100755
--- a/pepscriptsdev/07final-cleanup
+++ b/pepscriptsdev/07final-cleanup
@@ -21,6 +21,3 @@ chroot /target apt purge --autoremove -y \
 
 # Clean unnecessary files
 rm -r /target/boot/firmware
-
-# system update 
-chroot /target apt update && apt upgrade -y