diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/swiprep b/packages/base/all/initrds/loader-initrd-files/src/bin/swiprep
index e0aa0da2..426b773e 100755
--- a/packages/base/all/initrds/loader-initrd-files/src/bin/swiprep
+++ b/packages/base/all/initrds/loader-initrd-files/src/bin/swiprep
@@ -149,8 +149,11 @@ esac
 
 if test "${mode_install}${mode_overlay}"; then
   for arch in $ARCH_LIST; do
-    unzip -pq "$swipath" "rootfs-${arch}.sqsh" > "$workdir/rootfs.sqsh"
-    if test -s "$workdir/rootfs.sqsh"; then break; fi
+    unzip -q "$swipath" "rootfs-${arch}.sqsh" -d "$workdir"
+    if test -s "$workdir/rootfs-${arch}.sqsh"; then
+      mv "$workdir/rootfs-${arch}.sqsh" "$workdir/rootfs.sqsh"
+      break;
+    fi
   done
   if test ! -s "$workdir/rootfs.sqsh"; then
     echo "*** cannot find a valid rootfs" 1>&2
diff --git a/packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi b/packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi
index a4c8c446..5fabddd1 100755
--- a/packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi
+++ b/packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi
@@ -19,7 +19,7 @@ fi
 #
 for url in $SWI; do
     msg_info "Trying ${url}..."
-    timeout -t 60 boot "${url}" && exit 0
+    timeout -t 180 boot "${url}" && exit 0
 done
 
 exit 1