diff --git a/.github/workflows/self-scheduled.yml b/.github/workflows/self-scheduled.yml
index 503686f41916a0..cfa8dfc377af45 100644
--- a/.github/workflows/self-scheduled.yml
+++ b/.github/workflows/self-scheduled.yml
@@ -305,8 +305,8 @@ jobs:
           DS_DISABLE_NINJA=1 DS_BUILD_CPU_ADAM=1 DS_BUILD_FUSED_ADAM=1 python3 -m pip install deepspeed --global-option="build_ext" --global-option="-j8" --no-cache -v --disable-pip-version-check
 
       # To avoid unknown test failures
-      - name: Pre build DeepSpeed *again* (for nightly CI)
-        if: ${{ inputs.docker == 'huggingface/transformers-pytorch-deepspeed-nightly-gpu' }}
+      - name: Pre build DeepSpeed *again* (for nightly & Past CI)
+        if: ${{ contains(inputs.ci_event, 'Nightly CI') || contains(inputs.ci_event, 'Past CI') }}
         working-directory: ${{ inputs.working-directory-prefix }}/
         run: |
           python3 -m pip uninstall -y deepspeed