diff --git a/src/azurelinux/3.0/net10.0/android/Dockerfile b/src/azurelinux/3.0/net10.0/android/amd64/Dockerfile
similarity index 98%
rename from src/azurelinux/3.0/net10.0/android/Dockerfile
rename to src/azurelinux/3.0/net10.0/android/amd64/Dockerfile
index a28634d0..9098be11 100644
--- a/src/azurelinux/3.0/net10.0/android/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/android/amd64/Dockerfile
@@ -30,7 +30,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
 RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
     && rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 
 # Install Microsoft OpenJDK from the Microsoft OpenJDK 17 Mariner image.
 ENV LANG=en_US.UTF-8
diff --git a/src/azurelinux/3.0/net10.0/android/docker/Dockerfile b/src/azurelinux/3.0/net10.0/android/docker/amd64/Dockerfile
similarity index 87%
rename from src/azurelinux/3.0/net10.0/android/docker/Dockerfile
rename to src/azurelinux/3.0/net10.0/android/docker/amd64/Dockerfile
index 5c3c4ab9..11416ef1 100644
--- a/src/azurelinux/3.0/net10.0/android/docker/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/android/docker/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android-amd64
 
 RUN tdnf update -y \
     && tdnf install -y \
diff --git a/src/azurelinux/3.0/net10.0/cross/amd64-alpine/Dockerfile b/src/azurelinux/3.0/net10.0/cross/amd64-alpine/Dockerfile
index b7d5b26d..4e315cc8 100644
--- a/src/azurelinux/3.0/net10.0/cross/amd64-alpine/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/amd64-alpine/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.17 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="x86_64-alpine-linux-musl" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile b/src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile
index 85ed2b18..a3bd35f6 100644
--- a/src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # Use Ubuntu Bionic as the base image for the rootfs
@@ -43,7 +43,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
     cmake --build runtimes -j && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang
diff --git a/src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile
index 86f9300a..ed19477b 100644
--- a/src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh x64 bionic --skipunmount
@@ -39,7 +39,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
diff --git a/src/azurelinux/3.0/net10.0/cross/android/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/android/amd64/Dockerfile
index f421fd8f..b6e908ba 100644
--- a/src/azurelinux/3.0/net10.0/cross/android/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/android/amd64/Dockerfile
@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64 AS crossrootx64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android-amd64
 
 # Copy crossrootfs from AMD64 build image, so we can build Android-targeting code for that arch
 COPY --from=crossrootx64 /crossrootfs/x64 /crossrootfs/x64
diff --git a/src/azurelinux/3.0/net10.0/cross/arm-alpine/Dockerfile b/src/azurelinux/3.0/net10.0/cross/arm-alpine/Dockerfile
index e3d4a33d..fcd59400 100644
--- a/src/azurelinux/3.0/net10.0/cross/arm-alpine/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/arm-alpine/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/arm
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh arm alpine3.17 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="armv7-alpine-linux-musleabihf" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/azurelinux/3.0/net10.0/cross/arm/Dockerfile b/src/azurelinux/3.0/net10.0/cross/arm/Dockerfile
index 5edd263d..74180364 100644
--- a/src/azurelinux/3.0/net10.0/cross/arm/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/arm/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/arm
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # The arm rootfs targets Ubuntu 22.04, which is the first version with a
@@ -41,7 +41,7 @@ RUN TARGET_TRIPLE="arm-linux-gnueabihf" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
diff --git a/src/azurelinux/3.0/net10.0/cross/arm64-alpine/Dockerfile b/src/azurelinux/3.0/net10.0/cross/arm64-alpine/Dockerfile
index 1b361018..b1b22e08 100644
--- a/src/azurelinux/3.0/net10.0/cross/arm64-alpine/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/arm64-alpine/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/arm64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh arm64 alpine3.17 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="aarch64-alpine-linux-musl" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile
index 4dbd200e..eab21de1 100644
--- a/src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/arm64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh arm64 bionic --skipunmount
@@ -41,7 +41,7 @@ RUN TARGET_TRIPLE="aarch64-linux-gnu" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
diff --git a/src/azurelinux/3.0/net10.0/cross/armv6/Dockerfile b/src/azurelinux/3.0/net10.0/cross/armv6/Dockerfile
index 32b1b791..1ba5c596 100644
--- a/src/azurelinux/3.0/net10.0/cross/armv6/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/armv6/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/armv6
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # Install raspbian package signing keys
@@ -12,7 +12,7 @@ RUN wget http://raspbian.raspberrypi.org/raspbian/pool/main/r/raspbian-archive-k
 
 RUN /scripts/eng/common/cross/build-rootfs.sh armv6 bookworm lldb13
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile
index c59af303..3c054806 100644
--- a/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # Install packages needed by the FreeBSD bootstrap scripts
@@ -13,7 +13,7 @@ RUN tdnf install -y \
 
 RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/src/azurelinux/3.0/net10.0/cross/ppc64le/Dockerfile b/src/azurelinux/3.0/net10.0/cross/ppc64le/Dockerfile
index b99eb59b..1e4669ac 100644
--- a/src/azurelinux/3.0/net10.0/cross/ppc64le/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/ppc64le/Dockerfile
@@ -1,11 +1,11 @@
 ARG ROOTFS_DIR=/crossrootfs/ppc64le
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh bionic ppc64le
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/src/azurelinux/3.0/net10.0/cross/riscv64-alpine/Dockerfile b/src/azurelinux/3.0/net10.0/cross/riscv64-alpine/Dockerfile
index a52f6470..870ef7f6 100644
--- a/src/azurelinux/3.0/net10.0/cross/riscv64-alpine/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/riscv64-alpine/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/riscv64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 alpine3.20 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="riscv64-alpine-linux-musl" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile b/src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile
index 3cd5aa92..7b69e09b 100644
--- a/src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/riscv64
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # Install the latest debootstrap
@@ -47,7 +47,7 @@ RUN TARGET_TRIPLE="riscv64-linux-gnu" && \
     cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
     cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
diff --git a/src/azurelinux/3.0/net10.0/cross/s390x/Dockerfile b/src/azurelinux/3.0/net10.0/cross/s390x/Dockerfile
index 2a7e56b6..04b6fb57 100644
--- a/src/azurelinux/3.0/net10.0/cross/s390x/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/s390x/Dockerfile
@@ -1,11 +1,11 @@
 ARG ROOTFS_DIR=/crossrootfs/s390x
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 RUN /scripts/eng/common/cross/build-rootfs.sh bionic s390x
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
diff --git a/src/azurelinux/3.0/net10.0/cross/x86/Dockerfile b/src/azurelinux/3.0/net10.0/cross/x86/Dockerfile
index 77d478b0..a3e86fc4 100644
--- a/src/azurelinux/3.0/net10.0/cross/x86/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/cross/x86/Dockerfile
@@ -1,13 +1,13 @@
 ARG ROOTFS_DIR=/crossrootfs/x86
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 ARG ROOTFS_DIR
 
 # We don't ship linux-x86 binaries, so we don't need to make a custom libc++ build for servicing concerns.
 # We don't sanitize or instrument the linux-x64 build (as we don't ship it), so we don't need to build those runtime support libraries either.
 RUN /scripts/eng/common/cross/build-rootfs.sh x86 bionic --skipunmount
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
 ARG ROOTFS_DIR
 
 COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
diff --git a/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile
index f6ff2c1d..cabb8ada 100644
--- a/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile
+++ b/src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile
@@ -1,6 +1,6 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-amd64
 
 # Install LLVM that we built from source
 COPY --from=builder /usr/local /usr/local
diff --git a/src/azurelinux/manifest.json b/src/azurelinux/manifest.json
index 704d50f6..5aecc772 100644
--- a/src/azurelinux/manifest.json
+++ b/src/azurelinux/manifest.json
@@ -34,7 +34,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps": {}
+                "azurelinux-3.0-net10.0-crossdeps-amd64": {}
               }
             }
           ]
@@ -444,7 +444,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-fpm": {}
+                "azurelinux-3.0-net10.0-fpm-amd64": {}
               }
             }
           ]
@@ -456,7 +456,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps-builder": {}
+                "azurelinux-3.0-net10.0-crossdeps-builder-amd64": {}
               }
             }
           ]
@@ -468,7 +468,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-crossdeps-llvm": {}
+                "azurelinux-3.0-net10.0-crossdeps-llvm-amd64": {}
               }
             }
           ]
@@ -607,11 +607,11 @@
         {
          "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/android",
+              "dockerfile": "src/azurelinux/3.0/net10.0/android/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-android": {}
+                "azurelinux-3.0-net10.0-android-amd64": {}
               }
             }
           ]
@@ -631,11 +631,11 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/azurelinux/3.0/net10.0/android/docker",
+              "dockerfile": "src/azurelinux/3.0/net10.0/android/docker/amd64",
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-android-docker": {}
+                "azurelinux-3.0-net10.0-android-docker-amd64": {}
               }
             }
           ]
@@ -647,8 +647,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-android-openssl": {},
-                "azurelinux-3.0-net10.0-cross-android-openssl": {}
+                "azurelinux-3.0-net10.0-cross-android-openssl-amd64": {}
               }
             }
           ]
@@ -660,7 +659,7 @@
               "os": "linux",
               "osVersion": "azurelinux3.0",
               "tags": {
-                "azurelinux-3.0-net10.0-cross-freebsd-13": {}
+                "azurelinux-3.0-net10.0-cross-freebsd-13-amd64": {}
               }
             }
           ]