diff --git a/scripts/common b/scripts/common
index ce9f880..fe64e74 100644
--- a/scripts/common
+++ b/scripts/common
@@ -94,7 +94,7 @@ on_chroot() {
 		mount --bind /sys "${ROOTFS_DIR}/sys"
 	fi
 
-	setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+	capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
 }
 export -f on_chroot
 
diff --git a/stage4/07-pisdr-limesdr/00-run.sh b/stage4/07-pisdr-limesdr/00-run.sh
index 8d74819..8db8e36 100755
--- a/stage4/07-pisdr-limesdr/00-run.sh
+++ b/stage4/07-pisdr-limesdr/00-run.sh
@@ -11,9 +11,7 @@ fi
 cd LimeSuite
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS:STRING="-latomic -march=armv8-a -Wno-psabi" \
-      -DCMAKE_C_FLAGS:STRING="-latomic -march=armv8-a -Wno-psabi" \
-      -DENABLE_SIMD_FLAGS="foo" -GNinja -DCMAKE_BUILD_TYPE=Release ..
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
 ninja install
 ldconfig
 cd ..
diff --git a/stage4/12-pisdr-gnuradio/00-run.sh b/stage4/12-pisdr-gnuradio/00-run.sh
index 8fa5642..ca6e20e 100755
--- a/stage4/12-pisdr-gnuradio/00-run.sh
+++ b/stage4/12-pisdr-gnuradio/00-run.sh
@@ -11,10 +11,7 @@ fi
 cd volk
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv8-a -Wno-psabi" \
-      -DCMAKE_C_FLAGS:STRING="-march=armv8-a -Wno-psabi" \
-	  DCMAKE_ASM_FLAGS:STRING="-march=armv8-a -Wno-psabi" \
-	  -GNinja -DVOLK_CPU_FEATURES=OFF -DCMAKE_BUILD_TYPE=Release ..
+cmake -GNinja -DVOLK_CPU_FEATURES=OFF -DCMAKE_BUILD_TYPE=Release ..
 ninja install
 ldconfig
 cd ..