diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb16ee3de..fce789feb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,4 +98,4 @@ workflows:
             tags:
               only: /.*/
           build: "*musllinux*"
-          image: quay.io/pypa/musllinux_1_2_aarch64:2025.02.02-1
+          image: quay.io/pypa/musllinux_1_2_aarch64
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d43c11bd7..318f1d8bc 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -18,11 +18,12 @@ jobs:
     name: ${{ matrix.image }} wheels
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
         include:
           - image: manylinux_2_28_x86_64
             build: "*manylinux*"
-          - image: musllinux_1_2_x86_64:2025.02.02-1
+          - image: musllinux_1_2_x86_64
             build: "*musllinux*"
 
     steps:
@@ -53,13 +54,9 @@ jobs:
           # Linux arm64 wheels are built on circleci
           CIBW_ARCHS_LINUX: auto64 # ppc64le s390x
 
-
-      - id: image_name_fix
-        run: |
-          image=${{ matrix.image }}; echo "fixed_image_name=${image/:/_}" >>${GITHUB_OUTPUT}
       - uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{steps.image_name_fix.outputs.fixed_image_name}}
+          name: artifact-${{ matrix.image }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
diff --git a/cibw-requirements.txt b/cibw-requirements.txt
index 7e45ab550..6d9de094f 100644
--- a/cibw-requirements.txt
+++ b/cibw-requirements.txt
@@ -1 +1 @@
-cibuildwheel==3.1.0
+cibuildwheel>=3.1
diff --git a/pyproject.toml b/pyproject.toml
index c90d7a0a0..50c970c3b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,6 @@ write_to = "cwltool/_version.py"
 [tool.cibuildwheel]
 test-command = "python -m pytest --ignore cwltool/schemas -n logical --dist worksteal --junitxml={project}/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml -k 'not (test_bioconda or test_env_filtering or test_udocker)' --pyargs cwltool"
 test-requires = "-r test-requirements.txt"
-test-extras = "deps"
 build-verbosity = 1
 environment = { CWLTOOL_USE_MYPYC="1", MYPYPATH="$(pwd)/mypy-stubs" }
 # Disable building PyPy wheels on all platforms