diff --git a/.github/workflows/Draft-Release.yml b/.github/workflows/Draft-Release.yml
index 4b2414ac1..a7a539dbe 100644
--- a/.github/workflows/Draft-Release.yml
+++ b/.github/workflows/Draft-Release.yml
@@ -240,6 +240,7 @@ jobs:
 
     - name: Install CUDA (Windows)
       if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
+      timeout-minutes: 30
       shell: powershell
       env:
         cuda: ${{ env.CUDA }}
@@ -414,17 +415,12 @@ jobs:
         make install
 
     - name: Install setuptools and wheel
-      if: ${{ env.PYTHON >= 3.12 }}
       run: |
         python${{env.PYTHON}} -m pip install setuptools wheel
+
     - name: Add custom problem matchers for annotations
       run: echo "::add-matcher::.github/problem-matchers.json"
 
-    - name: Install setuptools and wheel
-      if: ${{ env.PYTHON >= 3.12 }}
-      run: |
-        python${{env.PYTHON}} -m pip install setuptools wheel
-
     # This patches a bug where ManyLinux doesn't generate buildnumber as git dir is owned by diff user
     - name: Enable git safe-directory
       run: git config --global --add safe.directory $GITHUB_WORKSPACE
@@ -542,6 +538,7 @@ jobs:
     - name: Install CUDA (Windows)
       if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
       shell: powershell
+      timeout-minutes: 30
       env:
         cuda: ${{ env.CUDA }}
         visual_studio: ${{ env.HOSTCXX }}
diff --git a/.github/workflows/Manylinux_2_28.yml b/.github/workflows/Manylinux_2_28.yml
index 105a80b34..7b00cb7ff 100644
--- a/.github/workflows/Manylinux_2_28.yml
+++ b/.github/workflows/Manylinux_2_28.yml
@@ -134,7 +134,6 @@ jobs:
         make install
 
     - name: Install setuptools and wheel
-      if: ${{ env.PYTHON >= 3.12 }}
       run: |
         python${{env.PYTHON}} -m pip install setuptools wheel
 
diff --git a/.github/workflows/Windows-Tests.yml b/.github/workflows/Windows-Tests.yml
index ea5994f67..89ad1fd26 100644
--- a/.github/workflows/Windows-Tests.yml
+++ b/.github/workflows/Windows-Tests.yml
@@ -74,6 +74,7 @@ jobs:
     - name: Install CUDA (Windows)
       if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
       shell: powershell
+      timeout-minutes: 30
       env:
         cuda: ${{ env.CUDA }}
         visual_studio: ${{ env.HOSTCXX }}
diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
index 0c800d87e..e22a3ca9b 100644
--- a/.github/workflows/Windows.yml
+++ b/.github/workflows/Windows.yml
@@ -122,6 +122,7 @@ jobs:
     - name: Install CUDA (Windows)
       if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
       shell: powershell
+      timeout-minutes: 30
       env:
         cuda: ${{ env.CUDA }}
         visual_studio: ${{ env.HOSTCXX }}