diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh
index 1453ba9e..fe4ff703 100755
--- a/builder/stage4/05-pisdr-gnuradio/00-run.sh
+++ b/builder/stage4/05-pisdr-gnuradio/00-run.sh
@@ -4,6 +4,22 @@ on_chroot << EOF
 mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
 cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
 
+if [ ! -d "volk" ]; then
+    git clone --recursive https://github.com/gnuradio/volk.git
+fi
+
+cd volk
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release ../
+make -j$(nproc) install
+ldconfig
+EOF
+
+on_chroot << EOF
+mkdir -p 	"/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
 if [ ! -d "gnuradio" ]; then
     git clone --recursive https://github.com/gnuradio/gnuradio.git
 fi
@@ -12,7 +28,8 @@ cd gnuradio
 git checkout maint-3.7
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
+cmake -DENABLE_INTERNAL_VOLK=OFF -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python ../
 make -j$(nproc) install
 ldconfig
 EOF
+
diff --git a/builder/stage4/12-pisdr-plutosdr/00-run.sh b/builder/stage4/12-pisdr-plutosdr/00-run.sh
deleted file mode 100644
index 57d8af73..00000000
--- a/builder/stage4/12-pisdr-plutosdr/00-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
-
-if [ ! -d "libiio" ]; then
-    git clone https://github.com/analogdevicesinc/libiio
-fi
-
-cd libiio
-mkdir -p build
-cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
-ldconfig
-EOF
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-plutosdr/01-run.sh b/builder/stage4/12-pisdr-plutosdr/01-run.sh
deleted file mode 100644
index b621599e..00000000
--- a/builder/stage4/12-pisdr-plutosdr/01-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
-
-if [ ! -d "libad9361-iio" ]; then
-    git clone https://github.com/analogdevicesinc/libad9361-iio
-fi
-
-cd libad9361-iio
-mkdir -p build
-cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
-ldconfig
-EOF
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-plutosdr/02-run.sh b/builder/stage4/12-pisdr-plutosdr/02-run.sh
deleted file mode 100644
index bbd4c1c5..00000000
--- a/builder/stage4/12-pisdr-plutosdr/02-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
-
-if [ ! -d "gr-iio" ]; then
-    git clone https://github.com/analogdevicesinc/gr-iio
-fi
-
-cd gr-iio
-mkdir -p build
-cd build
-cmake ../ -DINSTALL_UDEV_RULE=ON
-make -j$(nproc) install
-ldconfig
-EOF
\ No newline at end of file
diff --git a/builder/stage4/12-pisdr-plutosdr/03-run.sh b/builder/stage4/12-pisdr-plutosdr/03-run.sh
deleted file mode 100644
index 2612d529..00000000
--- a/builder/stage4/12-pisdr-plutosdr/03-run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-mkdir -p    "/home/${FIRST_USER_NAME}/PlutoSDR"
-cd 		    "/home/${FIRST_USER_NAME}/PlutoSDR"
-
-if [ ! -d "SoapyPlutoSDR" ]; then
-    git clone https://github.com/pothosware/SoapyPlutoSDR.git
-fi
-
-cd SoapyPlutoSDR
-mkdir -p build
-cd build
-cmake -DCMAKE_CXX_FLAGS=-latomic ../
-make -j$(nproc) install
-ldconfig
-EOF
\ No newline at end of file
diff --git a/builder/stage4/16-pisdr-sdrangel/00-run.sh b/builder/stage4/16-pisdr-sdrangel/00-run.sh
index 9c27a656..93319a2f 100755
--- a/builder/stage4/16-pisdr-sdrangel/00-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/00-run.sh
@@ -9,10 +9,10 @@ if [ ! -d "cm256cc" ]; then
 fi
 
 cd cm256cc
-git reset --hard f21e8bc1e9afdb0b28672743dcec111aec1d32d9
+git reset --hard c0e92b92aca3d1d36c990b642b937c64d363c559
 mkdir -p build
 cd build
 cmake ../
 make -j$(nproc) install
 ldconfig
-EOF
\ No newline at end of file
+EOF
diff --git a/builder/stage4/16-pisdr-sdrangel/03-run.sh b/builder/stage4/16-pisdr-sdrangel/03-run.sh
index 9bef4fb8..f9d6075d 100755
--- a/builder/stage4/16-pisdr-sdrangel/03-run.sh
+++ b/builder/stage4/16-pisdr-sdrangel/03-run.sh
@@ -9,10 +9,10 @@ if [ ! -d "dsdcc" ]; then
 fi
 
 cd dsdcc
-git reset --hard "v1.8.6"
+git reset --hard "v1.9.0"
 mkdir -p build
 cd build
 cmake -DUSE_MBELIB=ON  ../
 make -j$(nproc) install
 ldconfig
-EOF
\ No newline at end of file
+EOF