diff --git a/eng/pipelines/dotnet-buildtools-prereqs-all.yml b/eng/pipelines/dotnet-buildtools-prereqs-all.yml
index fd8d02825..2bc4493a5 100644
--- a/eng/pipelines/dotnet-buildtools-prereqs-all.yml
+++ b/eng/pipelines/dotnet-buildtools-prereqs-all.yml
@@ -13,6 +13,15 @@ parameters:
   type: boolean
   default: false
 
+- name: sourceBuildPipelineRunId
+  displayName: >
+    Source build pipeline run ID. This refers to runs of *this pipeline*.
+    Override this parameter in combination with disabling the `Build` stage to
+    test or publish images that were built in a different pipeline run. When
+    building new images, leave this value alone.
+  type: string
+  default: $(Build.BuildId)
+
 schedules:
 - cron: "0 5 1,15 * *"
   displayName: Monthly rebuild of all images
@@ -32,12 +41,18 @@ variables:
 - template: /eng/pipelines/variables/common.yml@self
   parameters: 
     disableMatrixTrimming: ${{ parameters.disableMatrixTrimming }}
+    sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 - name: publishEolAnnotations
   value: true
 
 extends:
   template: /eng/common/templates/1es-official.yml@self
   parameters:
+    serviceConnections:
+    - name: $(internal-mirror.serviceConnectionName)
+    - name: $(build.serviceConnectionName)
+    - name: $(publish.serviceConnectionName)
+    - name: $(marStatus.serviceConnectionName)
     stages:
     - template: /eng/pipelines/stages/build-test-publish-repo.yml@self
       parameters:
diff --git a/eng/pipelines/variables/common.yml b/eng/pipelines/variables/common.yml
index 8466525d8..9a3ccd31f 100644
--- a/eng/pipelines/variables/common.yml
+++ b/eng/pipelines/variables/common.yml
@@ -2,9 +2,16 @@ parameters:
 - name: disableMatrixTrimming
   type: boolean
   default: false
+# sourceBuildPipelineRunId should be overridden when skipping a build to run
+# tests or publish images that were produced in a different pipeline run.
+- name: sourceBuildPipelineRunId
+  type: string
+  default: ""
 
 variables:
 - template: /eng/common/templates/variables/dotnet/build-test-publish.yml@self
+  parameters:
+    sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}
 - name: officialBranches
   # comma-delimited list of branch names
   value: main
diff --git a/src/cbl-mariner/2.0/android/amd64/Dockerfile b/src/cbl-mariner/2.0/android/amd64/Dockerfile
index a9f752b43..479ecf9de 100644
--- a/src/cbl-mariner/2.0/android/amd64/Dockerfile
+++ b/src/cbl-mariner/2.0/android/amd64/Dockerfile
@@ -1,7 +1,7 @@
 ARG ANDROID_SDK_ROOT=/usr/local/android-sdk
 ARG ANDROID_NDK_VERSION=23.2.8568313
 ARG ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION
-FROM mcr.microsoft.com/openjdk/jdk:17-mariner AS android-sdk-download
+FROM mcr.microsoft.com/openjdk/jdk:17-mariner-cm2 AS android-sdk-download
 ARG ANDROID_SDK_ROOT
 ARG ANDROID_NDK_VERSION
 ARG ANDROID_NDK_ROOT
@@ -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/openjdk/jdk:17-mariner
+FROM mcr.microsoft.com/openjdk/jdk:17-mariner-cm2
 ARG ANDROID_SDK_ROOT
 ARG ANDROID_NDK_VERSION
 ARG ANDROID_NDK_ROOT