diff --git a/.github/workflows/_build_rosetta.yaml b/.github/workflows/_build_rosetta.yaml
index f876cb3dd..91a630238 100644
--- a/.github/workflows/_build_rosetta.yaml
+++ b/.github/workflows/_build_rosetta.yaml
@@ -43,7 +43,7 @@ jobs:
           if [[ -n "${{ inputs.BASE_IMAGE }}" ]]; then
             echo "BASE_IMAGE=${{ inputs.BASE_IMAGE }}" >> "$GITHUB_ENV"
           else
-            echo "BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/${{ inputs.BASE_LIBRARY }}:latest" >> "$GITHUB_ENV"
+            echo "BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/upstream-${{ inputs.BASE_LIBRARY }}:latest" >> "$GITHUB_ENV"
           fi
 
       - name: Print environment variables
diff --git a/.github/workflows/nightly-rosetta-pax-build.yaml b/.github/workflows/nightly-rosetta-pax-build.yaml
index 0074ad02e..1c8d23d10 100644
--- a/.github/workflows/nightly-rosetta-pax-build.yaml
+++ b/.github/workflows/nightly-rosetta-pax-build.yaml
@@ -19,7 +19,7 @@ on:
         required: false
 
 env:
-  BASE_LIBRARY: upstream-pax
+  BASE_LIBRARY: pax
   DOCKER_REGISTRY: ghcr.io/nvidia
 
 permissions:
@@ -44,7 +44,7 @@ jobs:
         run: |
           BUILD_DATE=$(TZ='US/Los_Angeles' date '+%Y-%m-%d')
           if [[ -z "${{ inputs.BASE_IMAGE }}" ]]; then
-            BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/${{ env.BASE_LIBRARY }}:latest
+            BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/upstream-${{ env.BASE_LIBRARY }}:latest
           else
             BASE_IMAGE=${{ inputs.BASE_IMAGE }}
           fi
diff --git a/.github/workflows/nightly-rosetta-t5x-build-test.yaml b/.github/workflows/nightly-rosetta-t5x-build-test.yaml
index 65b0f296e..ed0d0352e 100644
--- a/.github/workflows/nightly-rosetta-t5x-build-test.yaml
+++ b/.github/workflows/nightly-rosetta-t5x-build-test.yaml
@@ -19,7 +19,7 @@ on:
         required: false
 
 env:
-  BASE_LIBRARY: upstream-t5x
+  BASE_LIBRARY: t5x
   DOCKER_REGISTRY: ghcr.io/nvidia
 
 permissions:
@@ -44,7 +44,7 @@ jobs:
         run: |
           BUILD_DATE=$(TZ='US/Los_Angeles' date '+%Y-%m-%d')
           if [[ -z "${{ inputs.BASE_IMAGE }}" ]]; then
-            BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/${{ env.BASE_LIBRARY }}:latest
+            BASE_IMAGE=${{ env.DOCKER_REGISTRY }}/upstream-${{ env.BASE_LIBRARY }}:latest
           else
             BASE_IMAGE=${{ inputs.BASE_IMAGE }}
           fi