diff --git a/sources/libs/kxstudio-build-scripts/debian/changelog b/sources/libs/kxstudio-build-scripts/debian/changelog
index 8c673ed..ae9ea21 100644
--- a/sources/libs/kxstudio-build-scripts/debian/changelog
+++ b/sources/libs/kxstudio-build-scripts/debian/changelog
@@ -1,3 +1,9 @@
+kxstudio-build-scripts (7) focal; urgency=medium
+
+  * Skip main valgrind test on armhf
+
+ -- falkTX <falktx@falktx.com>  Tue, 10 May 2022 10:19:52 +0100
+
 kxstudio-build-scripts (6) focal; urgency=medium
 
   * Fix carla mem leaks
diff --git a/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.mk b/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.mk
index 6ad847e..f1db69e 100644
--- a/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.mk
+++ b/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.mk
@@ -2,6 +2,8 @@
 
 include /usr/share/dpkg/kxstudio.mk
 
+export DEB_HOST_ARCH
+
 define kxstudio_audio_plugin_test
 	/usr/share/dpkg/kxstudio-audio-plugin.sh
 endef
diff --git a/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.sh b/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.sh
index e893dda..9c27574 100755
--- a/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.sh
+++ b/sources/libs/kxstudio-build-scripts/kxstudio-audio-plugin.sh
@@ -27,9 +27,15 @@ CARLA_BRIDGE_NATIVE_BIN=/opt/kxstudio/lib/carla/carla-bridge-native
 CARLA_DISCOVERY_NATIVE_BIN=/opt/kxstudio/lib/carla/carla-discovery-native
 
 VALRIND_BIN="valgrind --error-exitcode=255 --leak-check=full --track-origins=yes --suppressions=$(dirname ${0})/kxstudio-audio-plugin.supp"
-VALRIND_BRIDGE_BIN="${VALRIND_BIN} ${CARLA_BRIDGE_NATIVE_BIN}"
 VALRIND_DISCOVERY_BIN="${VALRIND_BIN} ${CARLA_DISCOVERY_NATIVE_BIN}"
 
+# skip main valgrind test on armhf, incomplete syscall support
+if [ "${DEB_HOST_ARCH}" != "armhf" ]; then
+    VALRIND_BRIDGE_BIN="${VALRIND_BIN} ${CARLA_BRIDGE_NATIVE_BIN}"
+else
+    VALRIND_BRIDGE_BIN="${CARLA_BRIDGE_NATIVE_BIN}"
+fi
+
 export CARLA_BRIDGE_DUMMY=1
 export CARLA_BRIDGE_TESTING=native
 export LV2_PATH=$(pwd)/debian/${PKG_NAME}/usr/lib/lv2:/tmp/lv2-spec
diff --git a/sources/plugins/airwindows-lv2/debian/changelog b/sources/plugins/airwindows-lv2/debian/changelog
index 0b352b1..fcd334d 100644
--- a/sources/plugins/airwindows-lv2/debian/changelog
+++ b/sources/plugins/airwindows-lv2/debian/changelog
@@ -1,4 +1,4 @@
-airwindows-lv2 (6:1.0-1kxstudio3) focal; urgency=medium
+airwindows-lv2 (6:1.0-1kxstudio2) focal; urgency=medium
 
   * Initial package