diff --git a/.github/workflows/self-nightly-caller.yml b/.github/workflows/self-nightly-caller.yml
index daa91d913efdc6..4c3f4282c44588 100644
--- a/.github/workflows/self-nightly-caller.yml
+++ b/.github/workflows/self-nightly-caller.yml
@@ -36,7 +36,8 @@ jobs:
       job: run_torch_cuda_extensions_gpu
       slack_report_channel: "#transformers-ci-past-future"
       runner: ci
-      docker: huggingface/transformers-pytorch-deepspeed-nightly-gpu
+      # TODO: comment
+      docker: huggingface/transformers-pytorch-deepspeed-latest-gpu
       ci_event: Nightly CI
       working-directory-prefix: /workspace
     secrets: inherit
diff --git a/.github/workflows/self-scheduled.yml b/.github/workflows/self-scheduled.yml
index cfa8dfc377af45..b056759aa77379 100644
--- a/.github/workflows/self-scheduled.yml
+++ b/.github/workflows/self-scheduled.yml
@@ -274,7 +274,6 @@ jobs:
         machine_type: [single-gpu, multi-gpu]
     runs-on: ['${{ matrix.machine_type }}', nvidia-gpu, t4, '${{ inputs.runner }}']
     container:
-#      image: huggingface/transformers-pytorch-deepspeed-latest-gpu
       image: ${{ inputs.docker }}
       options: --gpus all --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/
     steps:
@@ -298,7 +297,7 @@ jobs:
 
       # To avoid unknown test failures
       - name: Pre build DeepSpeed *again* (for daily CI)
-        if: ${{ inputs.docker == 'huggingface/transformers-pytorch-deepspeed-latest-gpu' }}
+        if: ${{ contains(inputs.ci_event, 'Daily CI') }}
         working-directory: ${{ inputs.working-directory-prefix }}/
         run: |
           python3 -m pip uninstall -y deepspeed