diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 0b372b16142e..2efdb4cf1c37 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -348,13 +348,12 @@ extract_image() {
 
     info "Extracting swi content"
     ## Unzip the image except boot0 and dockerfs archive
-    unzip -oq "$swipath" -x boot0 "$dockerfs" -d "$image_path"
+    unzip -oq "$swipath" -x boot0 "$dockerfs" "platform.tar.gz" -d "$image_path"
 
     ## Extrat the platform.tar.gz
     info "Extracting platform.tar.gz"
-    mkdir -p $image_path/platform
-    tar xzf $image_path/platform.tar.gz -C $image_path/platform
-    rm -rf $image_path/platform.tar.gz
+    mkdir -p "$image_path/platform"
+    unzip -oqp "$swipath" "platform.tar.gz" | tar xzf - -C "$image_path/platform" $TAR_EXTRA_OPTION
 
     ## detect rootfs type
     local mountstr="$(grep " $target_path " /proc/mounts)"