diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml
index ace41a1db2b..c42f3be3312 100644
--- a/.github/workflows/ci-linux-incremental.yml
+++ b/.github/workflows/ci-linux-incremental.yml
@@ -18,6 +18,7 @@ name: CI Linux incremental
 on:
   pull_request:
     paths:
+      - '.github/workflows/ci-linux-incremental.yml'
       - 'build/pkgs/**'
       - '!build/pkgs/sage_conf/**'
       - '!build/pkgs/sage_docbuild/**'
@@ -95,13 +96,11 @@ jobs:
       targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
       tox_system_factors: >-
         ["ubuntu-focal",
-         "ubuntu-noble",
+         "ubuntu-jammy",
          "debian-bullseye",
          "debian-bookworm",
-         "fedora-30",
-         "fedora-40",]
+         "fedora-41",]
       tox_packages_factors: >-
-          ["standard",
-           "minimal"]
+          ["standard"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
       max_parallel: 8
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 8ab438a6b76..346c110f7b7 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -18,6 +18,10 @@ name: CI macOS
 #on: [push, pull_request]
 
 on:
+  pull_request:
+    paths:
+      - '.github/workflows/ci-macos.yml'
+      - '.github/workflows/macos.yml'
   push:
     tags:
       - '*'
@@ -60,7 +64,7 @@ jobs:
   stage-2-experimental-0-o:
     uses: ./.github/workflows/macos.yml
     with:
-      stage: "2-optional-0-o"
+      stage: "2-experimental-0-o"
     needs: [stage-2-optional-p-z]
     if: ${{ success() || failure() }}
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 37dbb2248a1..2909f20c79b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,7 +18,6 @@ on:
         # 'tox -e update_docker_platforms' updates below
         default: >-
           [
-           "ubuntu-xenial-toolchain-gcc_9",
            "ubuntu-focal",
            "ubuntu-jammy",
            "debian-bullseye",
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0346c699820..f920503c05f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -66,7 +66,7 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.osversion_xcodeversion_toxenv[2] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
-      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}
+      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.osversion_xcodeversion_toxenv[2] }}-macos-${{ matrix.osversion_xcodeversion_toxenv[0] }}${{ matrix.osversion_xcodeversion_toxenv[1] && format('-{0}', matrix.osversion_xcodeversion_toxenv[1]) }}-stage${{ inputs.stage }}
     steps:
       - name: Check out SageMath
         uses: actions/checkout@v4
@@ -163,4 +163,4 @@ jobs:
         with:
           path: sage-local-artifact/sage-${{ env.TOX_ENV }}-${{ inputs.stage }}.tar
           name: ${{ env.LOCAL_ARTIFACT_NAME }}
-        if: always()
+        if: contains(inputs.stage, '1')