diff --git a/.github/workflows/native-linux.yml b/.github/workflows/native-linux.yml
index 8cc30e80..ad400313 100644
--- a/.github/workflows/native-linux.yml
+++ b/.github/workflows/native-linux.yml
@@ -16,6 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     strategy:
+      fail-fast: false
       matrix:
         arch:
           - "386"
@@ -24,6 +25,9 @@ jobs:
           - arm64
           - linux-arm-v5
           - s390x
+          - mips64le
+          - ppc64le
+          - riscv64
 
     name: Linux binary ${{ matrix.arch }}
 
@@ -57,6 +61,6 @@ jobs:
       - name: Archive built jar
         uses: actions/upload-artifact@v2
         with:
-          name: jar-${{ matrix.arch }}
+          name: jar-${{ matrix.arch }}-Linux
           path: archive/*.jar
 
diff --git a/.github/workflows/native-macos.yml b/.github/workflows/native-macos.yml
index 3bc7f1e2..c4614ce2 100644
--- a/.github/workflows/native-macos.yml
+++ b/.github/workflows/native-macos.yml
@@ -1,29 +1,26 @@
 name: Build macOS Binaries
 
 on:
-#  push:
-#    branches: [ master ]
-#  pull_request:
-#    branches: [ master ]
-  # GHA does not support building Apple am64 very well, so we disable this workflow for now.
-  # See https://github.com/actions/runner/issues/805
   push:
-    branches-ignore:
-      - '**'
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   native:
 
-    runs-on: macos-latest
+    runs-on: [self-hosted, macos, aarch64]
 
     name: macOS binary
 
     steps:
       - uses: actions/checkout@v2
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 8
+          architecture: arm
       - name: cache dependencies
         uses: actions/cache@v1
         with:
@@ -36,15 +33,15 @@ jobs:
         run: "rm archive/* && ant jar && ant archive-platform-jar"
       - name: Dump config.log
         if: ${{ always() }}
-        run: "cat /Users/runner/work/jffi/jffi/build/jni/libffi-darwin-x86_64/config.log"
+        run: "cat build/jni/libffi-darwin-x86_64/config.log"
       - name: Archive built library
         uses: actions/upload-artifact@v2
         with:
           name: shared-object
-          path: build/jni/*.so
+          path: build/jni/*.jnilib
       - name: Archive built jar
         uses: actions/upload-artifact@v2
         with:
-          name: jar
+          name: jar-Darwin
           path: archive/*.jar
 
diff --git a/archive/jffi-Darwin.jar b/archive/jffi-Darwin.jar
index 56228523..268876a7 100644
Binary files a/archive/jffi-Darwin.jar and b/archive/jffi-Darwin.jar differ
diff --git a/archive/jffi-aarch64-Linux.jar b/archive/jffi-aarch64-Linux.jar
index 1d4438e3..892b8418 100644
Binary files a/archive/jffi-aarch64-Linux.jar and b/archive/jffi-aarch64-Linux.jar differ
diff --git a/archive/jffi-arm-Linux.jar b/archive/jffi-arm-Linux.jar
index f9a048b7..bde86ed2 100644
Binary files a/archive/jffi-arm-Linux.jar and b/archive/jffi-arm-Linux.jar differ
diff --git a/archive/jffi-i386-Linux.jar b/archive/jffi-i386-Linux.jar
index 7e23b400..bdc8afeb 100644
Binary files a/archive/jffi-i386-Linux.jar and b/archive/jffi-i386-Linux.jar differ
diff --git a/archive/jffi-s390x-Linux.jar b/archive/jffi-s390x-Linux.jar
index 559e9d20..2e576ca5 100644
Binary files a/archive/jffi-s390x-Linux.jar and b/archive/jffi-s390x-Linux.jar differ
diff --git a/archive/jffi-x86_64-Linux.jar b/archive/jffi-x86_64-Linux.jar
index 99deb014..4e0fa662 100644
Binary files a/archive/jffi-x86_64-Linux.jar and b/archive/jffi-x86_64-Linux.jar differ