diff --git a/.github/workflows/nightly-rosetta-pax-build.yaml b/.github/workflows/nightly-rosetta-pax-build.yaml
index 241ec083c..ea01f1f44 100644
--- a/.github/workflows/nightly-rosetta-pax-build.yaml
+++ b/.github/workflows/nightly-rosetta-pax-build.yaml
@@ -154,9 +154,10 @@ jobs:
     secrets: inherit
 
   # TODO: ARM Tests
-  publish-final:
-    # needs: [metadata, amd64, arm64, test-amd64]
-    needs: [metadata, amd64, test-amd64]
+  # The dated nightly is tagged regardless of the test results to assist troubleshooting
+  publish-final-dated:
+    # needs: [metadata, amd64, arm64]
+    needs: [metadata, amd64]
     if: needs.metadata.outputs.PUBLISH == 'true'
     uses: ./.github/workflows/_publish_container.yaml
     with:
@@ -165,22 +166,26 @@ jobs:
       # ${{ needs.arm64.outputs.DOCKER_TAG_FINAL }}
       TARGET_IMAGE: pax
       TARGET_TAGS: |
-        ${{ needs.test-amd64.outputs.TEST_STATUS == 'success' && 'type=raw,value=latest,priority=1000' || '' }}
         type=raw,value=nightly-${{ needs.metadata.outputs.BUILD_DATE }},priority=900
 
-  test-pax:
-    # needs: [metadata, amd64, arm64]
-    needs: [metadata, amd64]
-    uses: ./.github/workflows/_test_pax_rosetta.yaml
-    if: (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch'
+  # TODO: ARM Tests
+  # The latest tag is reserved for images that pass all the CI tests
+  publish-final-latest:
+    # needs: [metadata, amd64, arm64, test-amd64]
+    needs: [metadata, amd64, test-amd64]
+    if: needs.metadata.outputs.PUBLISH == 'true'
+    uses: ./.github/workflows/_publish_container.yaml
     with:
-      PAX_IMAGE: ${{ needs.amd64.outputs.DOCKER_TAG_FINAL }}
-    secrets: inherit
+      SOURCE_IMAGE: |
+        ${{ needs.amd64.outputs.DOCKER_TAG_FINAL }}
+      # ${{ needs.arm64.outputs.DOCKER_TAG_FINAL }}
+      TARGET_IMAGE: pax
+      TARGET_TAGS: |
+        type=raw,value=latest,priority=1000
 
   publish-pax:
     needs: [metadata, test-amd64]
     uses: ./.github/workflows/_publish_t5x_pax_results.yaml
-    if: (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || github.event_name == 'workflow_dispatch'
     with:
       BUILD_DATE: ${{ needs.metadata.outputs.BUILD_DATE }}
       EXPERIMENT_SUBDIR: ROSETTA_PAX
diff --git a/.github/workflows/nightly-rosetta-t5x-build-test.yaml b/.github/workflows/nightly-rosetta-t5x-build-test.yaml
index fc7a78ce1..0fba216a2 100644
--- a/.github/workflows/nightly-rosetta-t5x-build-test.yaml
+++ b/.github/workflows/nightly-rosetta-t5x-build-test.yaml
@@ -154,8 +154,9 @@ jobs:
       T5X_IMAGE: ${{ needs.amd64.outputs.DOCKER_TAG_FINAL }}
     secrets: inherit
 
-  publish-final:
-    needs: [metadata, amd64, arm64, test-t5x-amd64, test-unit-amd64]
+  # The dated nightly is tagged regardless of the test results to assist troubleshooting
+  publish-final-dated:
+    needs: [metadata, amd64, arm64]
     if: needs.metadata.outputs.PUBLISH == 'true'
     uses: ./.github/workflows/_publish_container.yaml
     with:
@@ -164,9 +165,21 @@ jobs:
         ${{ needs.arm64.outputs.DOCKER_TAG_FINAL }}
       TARGET_IMAGE: t5x
       TARGET_TAGS: |
-        ${{ ( needs.test-t5x-amd64.outputs.TEST_STATUS == 'success' && needs.test-unit-amd64.outputs.TEST_STATUS == 'success' ) && 'type=raw,value=latest,priority=1000' || '' }}
         type=raw,value=nightly-${{ needs.metadata.outputs.BUILD_DATE }},priority=900
 
+  # The latest tag is reserved for images that pass all the CI tests
+  publish-final-latest:
+    needs: [metadata, amd64, arm64, test-t5x-amd64, test-unit-amd64]
+    if: needs.metadata.outputs.PUBLISH == 'true'
+    uses: ./.github/workflows/_publish_container.yaml
+    with:
+      SOURCE_IMAGE: |
+        ${{ needs.amd64.outputs.DOCKER_TAG_FINAL }}
+        ${{ needs.arm64.outputs.DOCKER_TAG_FINAL }}
+      TARGET_IMAGE: t5x
+      TARGET_TAGS: |
+        type=raw,value=latest,priority=1000
+
   publish-t5x:
     needs: [metadata, test-t5x-amd64]
     uses: ./.github/workflows/_publish_t5x_pax_results.yaml