diff --git a/src/cbl-mariner/2.0/cross/amd64-alpine/Dockerfile b/src/cbl-mariner/2.0/cross/amd64-alpine/Dockerfile
index 69a574000..f1442a896 100644
--- a/src/cbl-mariner/2.0/cross/amd64-alpine/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/amd64-alpine/Dockerfile
@@ -4,7 +4,7 @@ ARG ROOTFS_DIR=/crossrootfs/x64
 RUN /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.13 --skipunmount
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-amd64-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/x64
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/cross/amd64/Dockerfile b/src/cbl-mariner/2.0/cross/amd64/Dockerfile
index ef87e51a5..562b4ca50 100644
--- a/src/cbl-mariner/2.0/cross/amd64/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/amd64/Dockerfile
@@ -3,13 +3,44 @@ ARG ROOTFS_DIR=/crossrootfs/x64
 
 RUN /scripts/eng/common/cross/build-rootfs.sh x64 xenial --skipunmount
 
+# Build compiler-rt profile library for PGO instrumentation
+RUN mkdir compiler-rt_build && cd compiler-rt_build && \
+    BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \
+    TARGET_TRIPLE="x86_64-linux-gnu" && \
+    cmake ../llvm-project.src/compiler-rt \
+        -DCOMPILER_RT_BUILD_PROFILE=ON \
+        -DCOMPILER_RT_BUILD_SANITIZERS=ON \
+        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
+        \
+        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
+        -DCOMPILER_RT_BUILD_CRT=OFF \
+        -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
+        -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+        -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+        -DCOMPILER_RT_BUILD_ORC=OFF \
+        -DCOMPILER_RT_BUILD_XRAY=OFF \
+        \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_ASM_COMPILER=clang \
+        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_CXX_COMPILER=clang++ \
+        -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \
+        -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
+        -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \
+        -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \
+        -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \
+    make -j $(getconf _NPROCESSORS_ONLN)
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-amd64-local
+RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
+    mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
+    cp compiler-rt_build/lib/linux/libclang_rt.profile-x86_64.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
+    cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include
+
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/x64
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
-
-RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
-    mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
-    cp /usr/lib/clang/${LLVM_VERSION}/lib/linux/libclang_rt.*-x86_64.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
-    cp -r /usr/include/sanitizer $ROOTFS_DIR/usr/include
diff --git a/src/cbl-mariner/2.0/cross/arm-alpine/Dockerfile b/src/cbl-mariner/2.0/cross/arm-alpine/Dockerfile
index 79ed300fd..0ed2026d6 100644
--- a/src/cbl-mariner/2.0/cross/arm-alpine/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/arm-alpine/Dockerfile
@@ -4,7 +4,7 @@ ARG ROOTFS_DIR=/crossrootfs/arm
 RUN /scripts/eng/common/cross/build-rootfs.sh arm alpine3.13 --skipunmount
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-arm-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/arm
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/cross/arm/Dockerfile b/src/cbl-mariner/2.0/cross/arm/Dockerfile
index f40615865..c7aeaa97c 100644
--- a/src/cbl-mariner/2.0/cross/arm/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/arm/Dockerfile
@@ -1,45 +1,46 @@
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder-local AS builder
 ARG ROOTFS_DIR=/crossrootfs/arm
 
-RUN tdnf install -y debootstrap
-
 RUN /scripts/eng/common/cross/build-rootfs.sh arm xenial --skipunmount
 
 # Build compiler-rt profile library for PGO instrumentation
 RUN mkdir compiler-rt_build && cd compiler-rt_build && \
     BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \
-    TARGET_TRIPLE=arm-linux-gnueabihf && \
+    TARGET_TRIPLE="arm-linux-gnueabihf" && \
     cmake ../llvm-project.src/compiler-rt \
         -DCOMPILER_RT_BUILD_PROFILE=ON \
-        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
         -DCOMPILER_RT_BUILD_SANITIZERS=ON \
-        -DCOMPILER_RT_BUILD_XRAY=OFF \
+        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
+        \
+        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
+        -DCOMPILER_RT_BUILD_CRT=OFF \
+        -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
         -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+        -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+        -DCOMPILER_RT_BUILD_ORC=OFF \
+        -DCOMPILER_RT_BUILD_XRAY=OFF \
         \
-        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_ASM_COMPILER=clang \
+        -DCMAKE_C_COMPILER=clang \
         -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \
         -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
-        -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DLLVM_CONFIG_PATH=llvm-config \
-        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=$ROOTFS_DIR/usr \
+        -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \
         -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \
     make -j $(getconf _NPROCESSORS_ONLN)
 
-RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
+RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
     mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp compiler-rt_build/lib/linux/libclang_rt.*-armhf.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-arm-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/arm
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/cross/arm64-alpine/Dockerfile b/src/cbl-mariner/2.0/cross/arm64-alpine/Dockerfile
index 3dd593c46..96d415fb5 100644
--- a/src/cbl-mariner/2.0/cross/arm64-alpine/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/arm64-alpine/Dockerfile
@@ -4,7 +4,7 @@ ARG ROOTFS_DIR=/crossrootfs/arm64
 RUN /scripts/eng/common/cross/build-rootfs.sh arm64 alpine3.13 --skipunmount
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-arm-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/arm64
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/cross/arm64/Dockerfile b/src/cbl-mariner/2.0/cross/arm64/Dockerfile
index f133a76b3..cc8efa80b 100644
--- a/src/cbl-mariner/2.0/cross/arm64/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/arm64/Dockerfile
@@ -6,38 +6,41 @@ RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial --skipunmount
 # Build compiler-rt profile library for PGO instrumentation
 RUN mkdir compiler-rt_build && cd compiler-rt_build && \
     BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \
-    TARGET_TRIPLE=aarch64-linux-gnu && \
+    TARGET_TRIPLE="aarch64-linux-gnu" && \
     cmake ../llvm-project.src/compiler-rt \
         -DCOMPILER_RT_BUILD_PROFILE=ON \
-        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
         -DCOMPILER_RT_BUILD_SANITIZERS=ON \
-        -DCOMPILER_RT_BUILD_XRAY=OFF \
+        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
+        \
+        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
+        -DCOMPILER_RT_BUILD_CRT=OFF \
+        -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
         -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+        -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+        -DCOMPILER_RT_BUILD_ORC=OFF \
+        -DCOMPILER_RT_BUILD_XRAY=OFF \
         \
-        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_ASM_COMPILER=clang \
+        -DCMAKE_C_COMPILER=clang \
         -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \
         -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
-        -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DLLVM_CONFIG_PATH=llvm-config \
-        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=$ROOTFS_DIR/usr \
+        -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \
         -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \
     make -j $(getconf _NPROCESSORS_ONLN)
 
-RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
+RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
     mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp compiler-rt_build/lib/linux/libclang_rt.*-aarch64.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-arm-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/arm64
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/cross/x86/Dockerfile b/src/cbl-mariner/2.0/cross/x86/Dockerfile
index 47c0ccdff..65d8ea35b 100644
--- a/src/cbl-mariner/2.0/cross/x86/Dockerfile
+++ b/src/cbl-mariner/2.0/cross/x86/Dockerfile
@@ -1,47 +1,46 @@
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder-local AS builder
 ARG ROOTFS_DIR=/crossrootfs/x86
 
-# Provides LLVMConfig.cmake, needed to build compiler-rt. Only needed on x86.
-# x64 doesn't need this because we use compiler-rt from the mariner package.
-# arm/arm64 don't need this because LLVMConfig.cmake is provided by the LLVM we build from source.
-RUN tdnf install -y llvm-devel
-
 RUN /scripts/eng/common/cross/build-rootfs.sh x86 xenial --skipunmount
 
 # Build compiler-rt profile library for PGO instrumentation
 RUN mkdir compiler-rt_build && cd compiler-rt_build && \
     BUILD_FLAGS="-v --sysroot=$ROOTFS_DIR" \
-    TARGET_TRIPLE=i386-linux-gnu && \
+    TARGET_TRIPLE="i386-linux-gnu" && \
     cmake ../llvm-project.src/compiler-rt \
         -DCOMPILER_RT_BUILD_PROFILE=ON \
-        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
         -DCOMPILER_RT_BUILD_SANITIZERS=ON \
-        -DCOMPILER_RT_BUILD_XRAY=OFF \
+        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
+        \
+        -DCOMPILER_RT_BUILD_BUILTINS=OFF \
+        -DCOMPILER_RT_BUILD_CRT=OFF \
+        -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
         -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+        -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+        -DCOMPILER_RT_BUILD_ORC=OFF \
+        -DCOMPILER_RT_BUILD_XRAY=OFF \
         \
-        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_ASM_COMPILER=clang \
+        -DCMAKE_C_COMPILER=clang \
         -DCMAKE_CXX_COMPILER=clang++ \
         -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld" \
         -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
-        -DCMAKE_ASM_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_C_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DCMAKE_CXX_COMPILER_TARGET=${TARGET_TRIPLE} \
-        -DLLVM_CONFIG_PATH=llvm-config \
-        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=$ROOTFS_DIR/usr \
+        -DCMAKE_ASM_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_C_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_CXX_COMPILER_TARGET="${TARGET_TRIPLE}" \
+        -DCMAKE_ASM_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_C_FLAGS="${BUILD_FLAGS}" \
         -DCMAKE_CXX_FLAGS="${BUILD_FLAGS}" && \
     make -j $(getconf _NPROCESSORS_ONLN)
 
-RUN LLVM_VERSION=12.0.1 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
+RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" && \
     mkdir -p $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp compiler-rt_build/lib/linux/libclang_rt.*-i386.a $ROOTFS_DIR/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/clang/${LLVM_VERSION}/lib/linux/ && \
     cp -r compiler-rt_build/include/sanitizer $ROOTFS_DIR/usr/include
 
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-amd64-local
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
 ARG ROOTFS_DIR=/crossrootfs/x86
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/cbl-mariner/2.0/crossdeps-amd64/Dockerfile b/src/cbl-mariner/2.0/crossdeps-amd64/Dockerfile
deleted file mode 100644
index 9a115b3ed..000000000
--- a/src/cbl-mariner/2.0/crossdeps-amd64/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-local
-
-RUN tdnf install -y \
-        clang \
-        lld \
-        compiler-rt
diff --git a/src/cbl-mariner/2.0/crossdeps-builder/Dockerfile b/src/cbl-mariner/2.0/crossdeps-builder/Dockerfile
index 5ad9cc021..e6d6e9982 100644
--- a/src/cbl-mariner/2.0/crossdeps-builder/Dockerfile
+++ b/src/cbl-mariner/2.0/crossdeps-builder/Dockerfile
@@ -47,11 +47,11 @@ RUN wget https://releases.llvm.org/release-keys.asc && \
     gpg --output release-keys.gpg --dearmor release-keys.asc && \
     rm release-keys.asc && \
 # 2. Download llvm sources and signature, and verify signature
-    LLVM_VERSION=12.0.1 && \
+    LLVM_VERSION=16.0.0 && \
     wget -O llvm-project.src.tar.xz.sig https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz.sig && \
-    echo "6cc956d622a7d3d746de0d71d8ca616a6c291e2c561703ac7a9535f38b999955 llvm-project.src.tar.xz.sig" | sha256sum -c && \
+    echo "2fa1ae520c6756fb53ede6bd9359f7e40fe5d0bfdbd04c359f3b8ce22958a896 llvm-project.src.tar.xz.sig" | sha256sum -c && \
     wget -O llvm-project.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz && \
-    echo "129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e llvm-project.src.tar.xz" | sha256sum -c && \
+    echo "9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254 llvm-project.src.tar.xz" | sha256sum -c && \
     gpg --keyring /release-keys.gpg --verify llvm-project.src.tar.xz.sig && \
     rm llvm-project.src.tar.xz.sig
 
diff --git a/src/cbl-mariner/2.0/crossdeps-arm/Dockerfile b/src/cbl-mariner/2.0/crossdeps-llvm/Dockerfile
similarity index 100%
rename from src/cbl-mariner/2.0/crossdeps-arm/Dockerfile
rename to src/cbl-mariner/2.0/crossdeps-llvm/Dockerfile
diff --git a/src/cbl-mariner/manifest.json b/src/cbl-mariner/manifest.json
index 04b073966..9d6b58ff5 100644
--- a/src/cbl-mariner/manifest.json
+++ b/src/cbl-mariner/manifest.json
@@ -77,29 +77,13 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/cbl-mariner/2.0/crossdeps-amd64",
+              "dockerfile": "src/cbl-mariner/2.0/crossdeps-llvm",
               "os": "linux",
               "osVersion": "cbl-mariner2.0",
               "tags": {
-                "cbl-mariner-2.0-crossdeps-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "cbl-mariner-2.0-crossdeps-amd64$(FloatingTagSuffix)": {},
-                "cbl-mariner-2.0-crossdeps-amd64-local": {
-                  "isLocal": true
-                }
-              }
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/cbl-mariner/2.0/crossdeps-arm",
-              "os": "linux",
-              "osVersion": "cbl-mariner2.0",
-              "tags": {
-                "cbl-mariner-2.0-crossdeps-arm-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "cbl-mariner-2.0-crossdeps-arm$(FloatingTagSuffix)": {},
-                "cbl-mariner-2.0-crossdeps-arm-local": {
+                "cbl-mariner-2.0-crossdeps-llvm-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "cbl-mariner-2.0-crossdeps-llvm$(FloatingTagSuffix)": {},
+                "cbl-mariner-2.0-crossdeps-llvm-local": {
                   "isLocal": true
                 }
               }