diff --git a/Dockerfile b/Dockerfile
index 0d93c5c9b05..ca4bf1ebe48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,16 @@ RUN sh -c "echo 'Package: *\nPin: release o=repo.radeon.com\nPin-priority: 600'
 # rocgdb doesn't work on 22.04, workaround by installing the older python packages that are in 20.04
 RUN add-apt-repository -y ppa:deadsnakes/ppa
 
+# Add LLVM repository for Clang 17 (ROCm 7.x ships with Clang 20 which has ODR false positives in ASAN)
+RUN curl -sL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
+    add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
+
 # Install dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated \
     apt-utils \
     bison \
     build-essential \
-    clang-14 \
+    clang-17 \
     cmake \
     curl \
     flex \
@@ -43,7 +47,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
     hip-dev \
     libnuma-dev \
     miopen-hip \
-    libomp-dev \
+    libomp-17-dev \
     rocblas \
     hipfft \
     hipsolver \
diff --git a/Jenkinsfile b/Jenkinsfile
index 9ca1c865cda..6c1dd412bcd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -250,7 +250,7 @@ pipeline {
                                     def debug_flags = "-g -O2 -fno-omit-frame-pointer -fsanitize=${sanitizers} -fno-sanitize-recover=${sanitizers}"
                                     buildrocmtest(
                                         [flags: "-DCMAKE_BUILD_TYPE=debug -DMIGRAPHX_ENABLE_C_API_TEST=Off -DMIGRAPHX_ENABLE_PYTHON=Off -DMIGRAPHX_ENABLE_GPU=Off -DMIGRAPHX_ENABLE_CPU=On -DCMAKE_CXX_FLAGS_DEBUG='${debug_flags}'",
-                                         compiler: '/usr/bin/clang++-14',
+                                         compiler: '/usr/bin/clang++-17',
                                          gpu_debug: '0'],
                                         docker_opts
                                     )
@@ -276,7 +276,7 @@ pipeline {
                                     def debug_flags = "-g -O2 -fno-omit-frame-pointer -fsanitize=${sanitizers} -fno-sanitize-recover=${sanitizers} -D_GLIBCXX_DEBUG"
                                     buildrocmtest(
                                         [flags: "-DCMAKE_BUILD_TYPE=debug -DMIGRAPHX_ENABLE_C_API_TEST=Off -DMIGRAPHX_ENABLE_PYTHON=Off -DMIGRAPHX_ENABLE_GPU=Off -DMIGRAPHX_ENABLE_CPU=Off -DCMAKE_CXX_FLAGS_DEBUG='${debug_flags}'",
-                                         compiler: '/usr/bin/clang++-14',
+                                         compiler: '/usr/bin/clang++-17',
                                          gpu_debug: '0'],
                                         docker_opts
                                     )