diff --git a/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
index f4cff1c..51fc3ba 100755
--- a/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script.sh
@@ -4,7 +4,11 @@ env-update
 source /etc/profile
 
 export FORCE_EAPI=2
-equo update || ( sleep 1200 && equo update ) || exit 1
+equo update
+if [ "${?}" != "0" ]; then
+        sleep 1200 || exit 1
+        equo update || exit 1
+fi
 
 # unmask apache with worker MPM
 equo unmask www-servers/apache[threads]
diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh
index d319b8d..9c7b902 100755
--- a/scripts/inner_source_chroot_update.sh
+++ b/scripts/inner_source_chroot_update.sh
@@ -12,7 +12,11 @@ fi
 
 export ETP_NOINTERACTIVE=1
 export FORCE_EAPI=2
-equo update || ( sleep 1200 && equo update ) || exit 1
+equo update
+if [ "${?}" != "0" ]; then
+	sleep 1200 || exit 1
+	equo update || exit 1
+fi
 equo upgrade || exit 1
 echo "-5" | equo conf update
 rm -rf /var/lib/entropy/client/packages
diff --git a/scripts/remaster_generic_inner_chroot_script.sh b/scripts/remaster_generic_inner_chroot_script.sh
index 5791cd0..9014b84 100755
--- a/scripts/remaster_generic_inner_chroot_script.sh
+++ b/scripts/remaster_generic_inner_chroot_script.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 export FORCE_EAPI=2
-equo update || ( sleep 1200 && equo update ) || exit 1
+equo update
+if [ "${?}" != "0" ]; then
+        sleep 1200 || exit 1
+        equo update || exit 1
+fi
 
 # disable all mirrors but GARR
 sed -n -e "/pkg.sabayon.org/p" -e "/garr.it/p" -e "/^branch/p" \