diff --git a/ci/toolchains/TC-arm-unknown-linux-gnueabihf.cmake b/ci/toolchains/TC-arm-unknown-linux-gnueabihf.cmake
index c54351bea..5355cc692 100644
--- a/ci/toolchains/TC-arm-unknown-linux-gnueabihf.cmake
+++ b/ci/toolchains/TC-arm-unknown-linux-gnueabihf.cmake
@@ -1,4 +1,5 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armhf)
 set(ZENOHC_CUSTOM_TARGET arm-unknown-linux-gnueabihf)
-set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
\ No newline at end of file
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
\ No newline at end of file
diff --git a/ci/toolchains/TC-armv7-unknown-linux-gnueabihf.cmake b/ci/toolchains/TC-armv7-unknown-linux-gnueabihf.cmake
index 49c9e5d20..846a53d6a 100644
--- a/ci/toolchains/TC-armv7-unknown-linux-gnueabihf.cmake
+++ b/ci/toolchains/TC-armv7-unknown-linux-gnueabihf.cmake
@@ -1,4 +1,5 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7)
 set(ZENOHC_CUSTOM_TARGET armv7-unknown-linux-gnueabihf)
-set(CMAKE_C_COMPILER armv7-linux-gnueabihf-gcc)
\ No newline at end of file
+set(CMAKE_C_COMPILER armv7-linux-gnueabihf-gcc)
+set(CMAKE_CXX_COMPILER armv7-linux-gnueabihf-g++)
\ No newline at end of file