diff --git a/build/build-SD-armbian.sh b/build/build-SD-armbian.sh
index 1a955c56..f77695a4 100755
--- a/build/build-SD-armbian.sh
+++ b/build/build-SD-armbian.sh
@@ -71,7 +71,7 @@ mkdir -p armbian/userpatches
 sed -e '/docker.*run/s/-it//' armbian/config/templates/config-docker.conf > armbian/userpatches/config-docker.conf
 docker pull "ghcr.io/armbian/build:$(cut -d"." -f1-2 < armbian/VERSION)-$(dpkg --print-architecture)" \
  || docker pull "ghcr.io/armbian/build:latest-$(dpkg --print-architecture)"
-armbian/compile.sh docker ncp
+sudo armbian/compile.sh docker ncp
 rm "$CONF"
 
 # pack image
diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh
index b7a2d0f1..d35e44d9 100755
--- a/build/build-SD-rpi.sh
+++ b/build/build-SD-rpi.sh
@@ -13,7 +13,7 @@ source build/buildlib.sh
 
 echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
 
-URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip"
+URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-09-26/2022-09-22-raspios-bullseye-arm64-lite.img.xz"
 SIZE=4G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
 IMG="${IMG:-NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img}"
diff --git a/build/buildlib.sh b/build/buildlib.sh
index 147d08b4..71aeb576 100644
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -279,7 +279,7 @@ function download_raspbian()
   local URL=$1
   local IMGFILE=$2
   local IMG_CACHE=cache/raspios_lite.img
-  local ZIP_CACHE=cache/raspios_lite.zip
+  local ZIP_CACHE=cache/raspios_lite.xz
 
   echo -e "\n\e[1m[ Download RaspiOS ]\e[0m"
   mkdir -p cache
@@ -294,8 +294,7 @@ function download_raspbian()
     wget "$URL" -nv -O "$ZIP_CACHE" || return 1
   }
 
-  unzip -o "$ZIP_CACHE" && \
-    mv *-raspios-*.img $IMG_CACHE && \
+  unxz -k -c "$ZIP_CACHE" > "$IMG_CACHE" && \
     cp -v --reflink=auto $IMG_CACHE "$IMGFILE"
 }