diff --git a/.github/workflows/docker-tag-push.yml b/.github/workflows/docker-tag-push.yml
index 0b01235b..c8ec7ec7 100644
--- a/.github/workflows/docker-tag-push.yml
+++ b/.github/workflows/docker-tag-push.yml
@@ -35,7 +35,9 @@ jobs:
     timeout-minutes: ${{ inputs.timeout-minutes }}
 
     steps:
+      # Image with CUDA needs extra disk space
       - name: Free disk space 🧹
+        if: contains(inputs.variant, 'cuda')
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
         with:
           tool-cache: false
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9220cdc3..ed5f407c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -222,7 +222,7 @@ jobs:
       variant: cuda
       platform: x86_64
       runs-on: ubuntu-24.04
-      timeout-minutes: 20
+      timeout-minutes: 25
     needs: x86_64-scipy
     if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }}
 
@@ -256,7 +256,7 @@ jobs:
       variant: cuda11
       platform: x86_64
       runs-on: ubuntu-24.04
-      timeout-minutes: 20
+      timeout-minutes: 25
     needs: x86_64-scipy
     if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }}
 
@@ -268,7 +268,7 @@ jobs:
       variant: cuda12
       platform: x86_64
       runs-on: ubuntu-24.04
-      timeout-minutes: 20
+      timeout-minutes: 25
     needs: x86_64-scipy
     if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }}