diff --git a/docker/base/linux-musl-hexagon.Dockerfile b/docker/base/linux-musl-hexagon.Dockerfile
index ac0b6a0..e380ede 100644
--- a/docker/base/linux-musl-hexagon.Dockerfile
+++ b/docker/base/linux-musl-hexagon.Dockerfile
@@ -13,8 +13,8 @@ ARG RUST_TARGET
 ARG TOOLCHAIN_DIR=/toolchain/x86_64-linux-gnu
 RUN mkdir -p /toolchain
 # https://codelinaro.jfrog.io/ui/native/codelinaro-toolchain-for-hexagon
-ARG LLVM_VERSION=16.0.6
-RUN curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/v${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-cross-${RUST_TARGET}.tar.xz" \
+ARG LLVM_VERSION=17.0.0-rc3
+RUN curl --proto '=https' --tlsv1.2 -fsSL --retry 10 --retry-connrefused "https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-cross-hexagon-unknown-linux-musl.tar.xz" \
         | tar xJf - --strip-components 1 -C /toolchain
 
 RUN <<EOF
diff --git a/docker/test/test.sh b/docker/test/test.sh
index 86eb259..f487f45 100755
--- a/docker/test/test.sh
+++ b/docker/test/test.sh
@@ -380,8 +380,8 @@ EOF
                         case "${RUST_TARGET}" in
                             hexagon-*)
                                 cp -f "${toolchain_dir}/${RUST_TARGET}/usr/lib"/{libc.a,Scrt1.o,crt1.o,crti.o,crtn.o,rcrt1.o} "${self_contained}"
-                                cp -f "${toolchain_dir}/${RUST_TARGET}/usr/lib/linux"/clang_rt.crtbegin-hexagon.o "${self_contained}"/crtbegin.o
-                                cp -f "${toolchain_dir}/${RUST_TARGET}/usr/lib/linux"/clang_rt.crtend-hexagon.o "${self_contained}"/crtend.o
+                                cp -f "${toolchain_dir}/${RUST_TARGET}/usr/lib"/clang_rt.crtbegin-hexagon.o "${self_contained}"/crtbegin.o
+                                cp -f "${toolchain_dir}/${RUST_TARGET}/usr/lib"/clang_rt.crtend-hexagon.o "${self_contained}"/crtend.o
                                 ;;
                             *)
                                 cp -f "${toolchain_dir}/${RUST_TARGET}/lib"/{libc.a,Scrt1.o,crt1.o,crti.o,crtn.o,rcrt1.o} "${self_contained}"