diff --git a/.github/workflows/nightly-bnb.yml b/.github/workflows/nightly-bnb.yml
index 093a7ff1b9..ae8fdc18f1 100644
--- a/.github/workflows/nightly-bnb.yml
+++ b/.github/workflows/nightly-bnb.yml
@@ -15,6 +15,7 @@ env:
 
 jobs:
   run_all_tests_single_gpu:
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -47,40 +48,40 @@ jobs:
             cd .. 
           fi
 
+      - name: Test bnb import
+        id: import
+        if: always()
+        run: |
+          source activate peft
+          python3 -m bitsandbytes
+          python3 -c "import bitsandbytes as bnb"
+
+      - name: Post to Slack
+        if: always()
+        uses: huggingface/hf-workflows/.github/actions/post-slack@main
+        with:
+          slack_channel: ${{ secrets.BNB_SLACK_CHANNEL_ID }}
+          title: 🤗 Results of bitsandbytes import
+          status: ${{ steps.examples_tests.outcome }}
+          slack_token: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}
+
       # TODO: uncomment this block if error is solved or bnb multi backend branch is merged
-      # - name: Test bnb import
-      #   id: import
+      # - name: Run examples on single GPU
+      #   id: examples_tests
       #   if: always()
       #   run: |
       #     source activate peft
-      #     python3 -m bitsandbytes
-      #     python3 -c "import bitsandbytes as bnb"
+      #     make tests_examples_single_gpu_bnb
 
       # - name: Post to Slack
       #   if: always()
       #   uses: huggingface/hf-workflows/.github/actions/post-slack@main
       #   with:
       #     slack_channel: ${{ secrets.BNB_SLACK_CHANNEL_ID }}
-      #     title: 🤗 Results of bitsandbytes import
-      #     status: ${{ steps.import.outcome }}
+      #     title: 🤗 Results of bitsandbytes examples tests - single GPU
+      #     status: ${{ steps.examples_tests.outcome }}
       #     slack_token: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}
 
-      - name: Run examples on single GPU
-        id: examples_tests
-        if: always()
-        run: |
-          source activate peft
-          make tests_examples_single_gpu_bnb
-
-      - name: Post to Slack
-        if: always()
-        uses: huggingface/hf-workflows/.github/actions/post-slack@main
-        with:
-          slack_channel: ${{ secrets.BNB_SLACK_CHANNEL_ID }}
-          title: 🤗 Results of bitsandbytes examples tests - single GPU
-          status: ${{ steps.examples_tests.outcome }}
-          slack_token: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}
-      
       - name: Run core tests on single GPU
         id: core_tests
         if: always()
@@ -136,6 +137,7 @@ jobs:
           python scripts/log_reports.py --slack_channel_name bnb-daily-ci-collab >> $GITHUB_STEP_SUMMARY
 
   run_all_tests_multi_gpu:
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix: