diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 30cc4d7..475734f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,6 +9,7 @@ jobs:
   build:
     name: Build & Release Image
     runs-on: ubuntu-latest
+    timeout-minutes: 2880
     env:
       working-directory: ./builder
     steps:
@@ -19,7 +20,7 @@ jobs:
         working-directory: ${{ env.working-directory }} 
         run: |
           bash build-docker.sh
-          echo ::set-output name=filename::$(ls deploy/*.zip | xargs -n 1 basename)
+          echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
         run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f4088d2..a1122ef 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -6,6 +6,7 @@ jobs:
   build:
     name: Build & Validate Image
     runs-on: ubuntu-latest
+    timeout-minutes: 2880
     env:
       working-directory: ./builder
     steps:
@@ -16,7 +17,7 @@ jobs:
         working-directory: ${{ env.working-directory }} 
         run: |
           bash build-docker.sh
-          echo ::set-output name=filename::$(ls deploy/*.zip | xargs -n 1 basename)
+          echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename)
       - name: Fix Permissions
         id: fix_perm_filename
         run: |
diff --git a/builder/Dockerfile b/builder/Dockerfile
index 706a5fb..cf9aac4 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM i386/debian:buster
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/builder/build.sh b/builder/build.sh
index a396b06..6885bd9 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -154,7 +154,7 @@ fi
 export USE_QEMU="${USE_QEMU:-0}"
 export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}"
 export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}"
-export ZIP_FILENAME="${ZIP_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}"}"
+export ZIP_FILENAME="${ZIP_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}"
 
 export SCRIPT_DIR="${BASE_DIR}/scripts"
 export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}"
diff --git a/builder/export-image/04-finalise/01-run.sh b/builder/export-image/04-finalise/01-run.sh
index 0864639..86970dc 100755
--- a/builder/export-image/04-finalise/01-run.sh
+++ b/builder/export-image/04-finalise/01-run.sh
@@ -86,12 +86,12 @@ unmount_image "${IMG_FILE}"
 
 mkdir -p "${DEPLOY_DIR}"
 
-rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip"
+rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz"
 rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 
 if [ "${DEPLOY_ZIP}" == "1" ]; then
 	pushd "${STAGE_WORK_DIR}" > /dev/null
-	zip "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.zip" \
+	tar -cJf "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz" \
 		"$(basename "${IMG_FILE}")"
 	popd > /dev/null
 else
diff --git a/builder/stage4/05-pisdr-gnuradio/00-packages-nr b/builder/stage4/05-pisdr-gnuradio/00-packages-nr
index a02b354..c858e2e 100644
--- a/builder/stage4/05-pisdr-gnuradio/00-packages-nr
+++ b/builder/stage4/05-pisdr-gnuradio/00-packages-nr
@@ -13,6 +13,9 @@ libqwt-dev
 libsdl1.2-dev
 libusb-1.0-0-dev
 pkg-config
+libasound2-dev
+pulseaudio
+libjack-dev
 python-wxgtk3.0
 python-qt4
 python-gtk2
diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh
index d88e227..b22c3e3 100755
--- a/builder/stage4/05-pisdr-gnuradio/00-run.sh
+++ b/builder/stage4/05-pisdr-gnuradio/00-run.sh
@@ -13,7 +13,6 @@ git pull
 git checkout maint-3.7
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/06-pisdr-soapysdr/01-run.sh b/builder/stage4/06-pisdr-soapysdr/01-run.sh
index 5dfca45..455fb31 100755
--- a/builder/stage4/06-pisdr-soapysdr/01-run.sh
+++ b/builder/stage4/06-pisdr-soapysdr/01-run.sh
@@ -12,7 +12,6 @@ cd SoapySDR
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/06-pisdr-soapysdr/02-run.sh b/builder/stage4/06-pisdr-soapysdr/02-run.sh
index b396c02..cb158a3 100755
--- a/builder/stage4/06-pisdr-soapysdr/02-run.sh
+++ b/builder/stage4/06-pisdr-soapysdr/02-run.sh
@@ -12,7 +12,6 @@ cd SoapyRemote
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/06-pisdr-soapysdr/03-run.sh b/builder/stage4/06-pisdr-soapysdr/03-run.sh
index 355d326..99cdc23 100755
--- a/builder/stage4/06-pisdr-soapysdr/03-run.sh
+++ b/builder/stage4/06-pisdr-soapysdr/03-run.sh
@@ -10,9 +10,9 @@ fi
 
 cd gr-soapy
 git pull
+git checkout maint-3.7
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/07-pisdr-limesdr/00-run.sh
index 38431e0..3380d45 100755
--- a/builder/stage4/07-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/00-run.sh
@@ -12,7 +12,6 @@ cd LimeSuite
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_LINK_FLAGS="$(DCMAKE_CXX_LINK_FLAGS) -latomic" ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/07-pisdr-limesdr/01-run.sh
index 1658893..7c9e6d7 100755
--- a/builder/stage4/07-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/07-pisdr-limesdr/01-run.sh
@@ -12,7 +12,6 @@ cd gr-limesdr
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/08-pisdr-airspy/00-run.sh b/builder/stage4/08-pisdr-airspy/00-run.sh
index 4595ca8..ebff4f1 100755
--- a/builder/stage4/08-pisdr-airspy/00-run.sh
+++ b/builder/stage4/08-pisdr-airspy/00-run.sh
@@ -12,7 +12,6 @@ cd airspyone_host
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/08-pisdr-airspy/01-run.sh b/builder/stage4/08-pisdr-airspy/01-run.sh
index 4fff743..709b211 100755
--- a/builder/stage4/08-pisdr-airspy/01-run.sh
+++ b/builder/stage4/08-pisdr-airspy/01-run.sh
@@ -12,7 +12,6 @@ cd airspyhf
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/08-pisdr-airspy/02-run.sh b/builder/stage4/08-pisdr-airspy/02-run.sh
index 14dcd33..b5c6ad9 100755
--- a/builder/stage4/08-pisdr-airspy/02-run.sh
+++ b/builder/stage4/08-pisdr-airspy/02-run.sh
@@ -12,7 +12,6 @@ cd SoapyAirspy
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/09-pisdr-rtlsdr/00-run.sh b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
index 498fd30..534d564 100755
--- a/builder/stage4/09-pisdr-rtlsdr/00-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/00-run.sh
@@ -12,7 +12,6 @@ cd rtl-sdr
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/09-pisdr-rtlsdr/01-run.sh b/builder/stage4/09-pisdr-rtlsdr/01-run.sh
index 33ce2f5..808a776 100755
--- a/builder/stage4/09-pisdr-rtlsdr/01-run.sh
+++ b/builder/stage4/09-pisdr-rtlsdr/01-run.sh
@@ -12,7 +12,6 @@ cd SoapyRTLSDR
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/10-pisdr-plutosdr/00-run.sh b/builder/stage4/10-pisdr-plutosdr/00-run.sh
index f6c4d6b..f61a448 100755
--- a/builder/stage4/10-pisdr-plutosdr/00-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/00-run.sh
@@ -12,7 +12,6 @@ cd libiio
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/10-pisdr-plutosdr/01-run.sh b/builder/stage4/10-pisdr-plutosdr/01-run.sh
index a9aef6a..0da3211 100755
--- a/builder/stage4/10-pisdr-plutosdr/01-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/01-run.sh
@@ -12,7 +12,6 @@ cd libad9361-iio
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/10-pisdr-plutosdr/02-run.sh b/builder/stage4/10-pisdr-plutosdr/02-run.sh
index 99597e2..2ad2698 100755
--- a/builder/stage4/10-pisdr-plutosdr/02-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/02-run.sh
@@ -12,7 +12,6 @@ cd gr-iio
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../ -DINSTALL_UDEV_RULE=ON
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/10-pisdr-plutosdr/03-run.sh b/builder/stage4/10-pisdr-plutosdr/03-run.sh
index 7d1f3d4..3f78482 100755
--- a/builder/stage4/10-pisdr-plutosdr/03-run.sh
+++ b/builder/stage4/10-pisdr-plutosdr/03-run.sh
@@ -12,7 +12,6 @@ cd SoapyPlutoSDR
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DCMAKE_CXX_FLAGS=-latomic ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/13-pisdr-osmocom/00-run.sh b/builder/stage4/11-pisdr-osmocom/00-run.sh
old mode 100644
new mode 100755
similarity index 92%
rename from builder/stage4/13-pisdr-osmocom/00-run.sh
rename to builder/stage4/11-pisdr-osmocom/00-run.sh
index b1aa545..f7f453a
--- a/builder/stage4/13-pisdr-osmocom/00-run.sh
+++ b/builder/stage4/11-pisdr-osmocom/00-run.sh
@@ -13,7 +13,6 @@ git pull
 git checkout gr3.7
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/00-packages-nr b/builder/stage4/12-pisdr-sdrangel/00-packages-nr
similarity index 100%
rename from builder/stage4/11-pisdr-sdrangel/00-packages-nr
rename to builder/stage4/12-pisdr-sdrangel/00-packages-nr
diff --git a/builder/stage4/11-pisdr-sdrangel/00-run.sh b/builder/stage4/12-pisdr-sdrangel/00-run.sh
similarity index 93%
rename from builder/stage4/11-pisdr-sdrangel/00-run.sh
rename to builder/stage4/12-pisdr-sdrangel/00-run.sh
index 241d339..5df88c3 100755
--- a/builder/stage4/11-pisdr-sdrangel/00-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/00-run.sh
@@ -13,7 +13,6 @@ git pull
 git reset --hard f21e8bc1e9afdb0b28672743dcec111aec1d32d9
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/01-run.sh b/builder/stage4/12-pisdr-sdrangel/01-run.sh
similarity index 93%
rename from builder/stage4/11-pisdr-sdrangel/01-run.sh
rename to builder/stage4/12-pisdr-sdrangel/01-run.sh
index f49a589..1d37b26 100755
--- a/builder/stage4/11-pisdr-sdrangel/01-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/01-run.sh
@@ -13,7 +13,6 @@ git pull
 git reset --hard 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/02-run.sh b/builder/stage4/12-pisdr-sdrangel/02-run.sh
similarity index 92%
rename from builder/stage4/11-pisdr-sdrangel/02-run.sh
rename to builder/stage4/12-pisdr-sdrangel/02-run.sh
index 5bd1763..756f50d 100755
--- a/builder/stage4/11-pisdr-sdrangel/02-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/02-run.sh
@@ -13,7 +13,6 @@ git pull
 git reset --hard "v1.1.4"
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/03-run.sh b/builder/stage4/12-pisdr-sdrangel/03-run.sh
similarity index 93%
rename from builder/stage4/11-pisdr-sdrangel/03-run.sh
rename to builder/stage4/12-pisdr-sdrangel/03-run.sh
index a24f11b..7f9162e 100755
--- a/builder/stage4/11-pisdr-sdrangel/03-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/03-run.sh
@@ -13,7 +13,6 @@ git pull
 git reset --hard "v1.8.6"
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake -DUSE_MBELIB=ON  ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/04-run.sh b/builder/stage4/12-pisdr-sdrangel/04-run.sh
similarity index 93%
rename from builder/stage4/11-pisdr-sdrangel/04-run.sh
rename to builder/stage4/12-pisdr-sdrangel/04-run.sh
index 613e528..3ec1921 100755
--- a/builder/stage4/11-pisdr-sdrangel/04-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/04-run.sh
@@ -13,7 +13,6 @@ git pull
 git reset --hard 76a20416d715ee06f8b36a9953506876689a3bd2
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/11-pisdr-sdrangel/05-run.sh b/builder/stage4/12-pisdr-sdrangel/05-run.sh
similarity index 92%
rename from builder/stage4/11-pisdr-sdrangel/05-run.sh
rename to builder/stage4/12-pisdr-sdrangel/05-run.sh
index 7b97b26..34e361b 100755
--- a/builder/stage4/11-pisdr-sdrangel/05-run.sh
+++ b/builder/stage4/12-pisdr-sdrangel/05-run.sh
@@ -12,7 +12,6 @@ cd sdrangel
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig
diff --git a/builder/stage4/12-pisdr-gqrx/00-packages-nr b/builder/stage4/13-pisdr-gqrx/00-packages-nr
similarity index 100%
rename from builder/stage4/12-pisdr-gqrx/00-packages-nr
rename to builder/stage4/13-pisdr-gqrx/00-packages-nr
diff --git a/builder/stage4/12-pisdr-gqrx/00-run.sh b/builder/stage4/13-pisdr-gqrx/00-run.sh
similarity index 92%
rename from builder/stage4/12-pisdr-gqrx/00-run.sh
rename to builder/stage4/13-pisdr-gqrx/00-run.sh
index 8db7d46..8629c1a 100755
--- a/builder/stage4/12-pisdr-gqrx/00-run.sh
+++ b/builder/stage4/13-pisdr-gqrx/00-run.sh
@@ -12,7 +12,6 @@ cd gqrx
 git pull
 mkdir -p build
 cd build
-rm -rf CMakeCache.txt
 cmake ../
 make -j$(nproc) install
 ldconfig