diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 10451e1914..7ca7291681 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -15,6 +15,7 @@ on:
   schedule:
     # 3 am Tuesdays and Fridays
     - cron: "0 3 * * 2,5"
+  workflow_dispatch:
 
 
 concurrency:
@@ -37,9 +38,11 @@ jobs:
       fail-fast: false
       matrix:
         buildplat:
-          - [ubuntu-22.04, manylinux_x86_64, x86_64]
-          - [windows-2022, win_amd64, AMD64]
-          - [macos-14, macosx_*, arm64]
+          - [ubuntu-22.04, manylinux, x86_64]
+          - [ubuntu-24.04-arm, manylinux, aarch64]
+          - [windows-2025, win, AMD64]
+          - [macos-14, macosx, arm64]
+          - [macos-15-intel, macosx, x86_64]
         python: ["cp311", "cp312", "cp313", "cp314"]
     defaults:
       run:
@@ -50,11 +53,11 @@ jobs:
           fetch-depth: 0
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.4.0
+        uses: pypa/cibuildwheel@v3.4.1
         with:
           package-dir: package
         env:
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}_${{ matrix.buildplat[2] }}
           CIBW_ARCHS: ${{ matrix.buildplat[2] }}
           CIBW_BUILD_VERBOSITY: 1
 
@@ -144,7 +147,7 @@ jobs:
           mv dist/mdanalysistests-* testsuite/dist
 
       - name: upload_source_and_wheels
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         with:
           skip_existing: true
           repository_url: https://test.pypi.org/legacy/
@@ -173,7 +176,7 @@ jobs:
           mv dist/mdanalysistests-* testsuite/dist
 
       - name: upload_tests
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         with:
           packages_dir: testsuite/dist
           skip_existing: true
@@ -203,7 +206,7 @@ jobs:
           mv dist/mdanalysistests-* testsuite/dist
 
       - name: upload_source_and_wheels
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
 
   upload_pypi_mdanalysistests:
     if: |
@@ -229,7 +232,7 @@ jobs:
           mv dist/mdanalysistests-* testsuite/dist
 
       - name: upload_tests
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         with:
           packages_dir: testsuite/dist
 
@@ -249,8 +252,11 @@ jobs:
         type: ["FULL", "MIN"]
         exclude:
           # Multiple deps don't like windows
+          # no osx-arm64 packages for HOLE2
           - os: windows-latest
             type: "FULL"
+          - os: "macos-latest"
+            type: "FULL"
           - python-version: "3.14"
             type: "FULL"
     env:
@@ -260,7 +266,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: setup_micromamba
-        uses: mamba-org/setup-micromamba@v2
+        uses: mamba-org/setup-micromamba@v3
         with:
           environment-name: mda
           create-args: >-