diff --git a/.github/workflows/build-libraries.yaml b/.github/workflows/build-libraries.yaml
index d231bce..3224fd0 100644
--- a/.github/workflows/build-libraries.yaml
+++ b/.github/workflows/build-libraries.yaml
@@ -6,9 +6,14 @@ on:
       - '*-x86_64'
 
 jobs:
-  build_macosx_x86_64:
-    name: Build MacOSX (x86_64)
-    runs-on: macOS-11
+  build_macosx:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-13 is an intel runner, higher macos's are apple silicon
+        # At some point, maybe get this to work on windows-latest
+        os: [macos-13, macos-latest]
 
     steps:
       - name: Checkout
@@ -18,11 +23,19 @@ jobs:
         uses: lukka/get-cmake@latest
 
       - name: Run the build
+        if: ${{ matrix.python-version }} == "macos-13"
         run: |
             git config --global --add safe.directory $(pwd)
             ./build_macosx.sh "x86_64"
             tar -czf macosx_x86_64.tar.gz installed/
 
+      - name: Run the build
+        if: ${{ matrix.python-version }} == "macos-latest"
+        run: |
+            git config --global --add safe.directory $(pwd)
+            ./build_macosx.sh "arm64"
+            tar -czf macosx_arm64.tar.gz installed/
+
       - name: Upload tarballs
         uses: actions/upload-artifact@v3
         with:
@@ -50,12 +63,12 @@ jobs:
 
   publish:
     name: Publish libraries
-    needs: [build_macosx_x86_64, build_windows_x86_64]
+    needs: [build_macosx, build_windows_x86_64]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download macosx (x86_64) artifact
+      - name: Download macosx artifact
         uses: actions/download-artifact@v3
         with:
           path: dump
@@ -67,5 +80,5 @@ jobs:
       - name: Publish release
         uses: softprops/action-gh-release@v1
         with:
-          name: "HDF5 binaries (x86_64)"
+          name: "HDF5 binaries"
           files: dump/*/*
diff --git a/manylinux_x86_64.dockerfile b/manylinux_x86_64.dockerfile
index ed349fb..78a3f80 100644
--- a/manylinux_x86_64.dockerfile
+++ b/manylinux_x86_64.dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux2014_x86_64
+FROM quay.io/pypa/manylinux_x_y
 WORKDIR /home/root
 COPY setup* .
 COPY build_linux.sh .
diff --git a/musllinux_x86_64.dockerfile b/musllinux_x86_64.dockerfile
index 03de2b8..6ceaa6b 100644
--- a/musllinux_x86_64.dockerfile
+++ b/musllinux_x86_64.dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/musllinux_1_1_x86_64
+FROM quay.io/pypa/musllinux_1_2
 WORKDIR /home/root
 COPY setup* .
 COPY build_linux.sh .