diff --git a/.cargo/config.toml b/.cargo/config.toml
index 153e58df2..9897badd9 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -3,6 +3,22 @@ rustflags = "-Ctarget-feature=-crt-static"
 
 [target.aarch64-unknown-linux-musl]
 rustflags = "-Ctarget-feature=-crt-static"
+linker = "aarch64-linux-musl-gcc"
+
+[target.arm-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+
+[target.arm-unknown-linux-gnueabi]
+linker = "arm-linux-gnueabi-gcc"
 
 [target.armv7-unknown-linux-gnueabihf]
-linker = "armv7-linux-gnueabihf-gcc"
\ No newline at end of file
+linker = "armv7-linux-gnueabihf-gcc"
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.x86_64-unknown-linux-gnu]
+linker = "x86_64-linux-gnu-gcc"
+
+[target.x86_64-pc-windows-gnu]
+linker = "x86_64-w64-mingw32-gcc"
\ No newline at end of file
diff --git a/ci/toolchains/TC-x86_64-pc-windows-gnu.cmake b/ci/toolchains/TC-x86_64-pc-windows-gnu.cmake
index bd8d38787..2afb5508d 100644
--- a/ci/toolchains/TC-x86_64-pc-windows-gnu.cmake
+++ b/ci/toolchains/TC-x86_64-pc-windows-gnu.cmake
@@ -2,4 +2,4 @@ set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(ZENOHC_CUSTOM_TARGET x86_64-pc-windows-gnu)
 set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-set(CMAKE_CXX_COMPILER_TARGET x86_64-w64-mingw32-g++)
\ No newline at end of file
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
\ No newline at end of file