diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh
index df3629f..e044064 100755
--- a/scripts/inner_source_chroot_update.sh
+++ b/scripts/inner_source_chroot_update.sh
@@ -60,16 +60,6 @@ done
 safe_run equo upgrade --fetch || exit 1
 equo upgrade --purge || exit 1
 
-# Unmask packages (used on custom ISO)
-if [ -n "${SABAYON_UNMASK_PKGS}" ] ; then
-  touch /etc/entropy/packages/package.unmask
-  equo unmask ${SABAYON_EXTRA_PKGS}
-fi
-
-# Add custom packages required from user for source rootfs.
-if [ -n "${SABAYON_EXTRA_PKGS}" ] ; then
-  safe_run equo i ${SABAYON_EXTRA_PKGS[@]}
-fi
 
 equo remove "${PACKAGES_TO_REMOVE[@]}" # ignore
 echo "-5" | equo conf update
@@ -117,6 +107,19 @@ for moddir in $(find /lib/modules -maxdepth 1 -type d -empty); do
   rmdir "${moddir}"
 done
 
+
+# Unmask packages (used on custom ISO)
+if [ -n "${SABAYON_UNMASK_PKGS}" ] ; then
+  touch /etc/entropy/packages/package.unmask
+  equo unmask ${SABAYON_EXTRA_PKGS}
+fi
+
+# Add custom packages required from user for source rootfs.
+if [ -n "${SABAYON_EXTRA_PKGS}" ] ; then
+  safe_run equo i ${SABAYON_EXTRA_PKGS[@]}
+fi
+
+
 rm -rf /var/lib/entropy/client/packages
 
 # copy Portage config from sabayonlinux.org entropy repo to system