diff --git a/stage4/05-pisdr-uhd/00-run.sh b/stage4/05-pisdr-uhd/00-run.sh
index 4c92c61..6c19a13 100755
--- a/stage4/05-pisdr-uhd/00-run.sh
+++ b/stage4/05-pisdr-uhd/00-run.sh
@@ -11,10 +11,7 @@ fi
 cd uhd/host
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv6z -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -Wno-psabi" \
-      -DCMAKE_C_FLAGS:STRING="-march=armv6z -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -Wno-psabi" \
-      -DCMAKE_ASM_FLAGS:STRING="-march=armv6z -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard " \
-      -GNinja -DNEON_SIMD_ENABLE=OFF -DCMAKE_BUILD_TYPE=Release ../
+cmake -GNinja -DNEON_SIMD_ENABLE=ON -DCMAKE_BUILD_TYPE=Release ../
 ninja install
 cp /usr/local/lib/uhd/utils/uhd-usrp.rules /etc/udev/rules.d/
 ldconfig
diff --git a/stage4/27-pisdr-airband/00-run.sh b/stage4/27-pisdr-airband/00-run.sh
index dab5fae..318cfca 100755
--- a/stage4/27-pisdr-airband/00-run.sh
+++ b/stage4/27-pisdr-airband/00-run.sh
@@ -9,7 +9,7 @@ if [ ! -d "RTLSDR-Airband" ]; then
 fi
 
 cd RTLSDR-Airband
-export PLATFORM=armv7-generic
+export PLATFORM=armv8-generic
 export WITH_SOAPYSDR=1
 mkdir -p build
 cd build