diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 142c8be3..d17b12bb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,9 +9,9 @@ jobs:
   build-skia:
     strategy:
       matrix:
-        arch: ["x86" , "x64", "arm", "arm64", "iossim_arm64"]
-        
-    runs-on: macos-12
+        arch: ["x86", "x64", "arm", "arm64", "iossim_arm64"]
+
+    runs-on: [self-hosted, macOS, ARM64]
     permissions:
       id-token: write
       contents: read
@@ -20,18 +20,18 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-region: us-west-2
-          role-to-assume:  ${{ secrets.ACTIONS_ROLE }}
+          role-to-assume: ${{ secrets.ACTIONS_ROLE }}
       - name: Checkout Code
         uses: actions/checkout@v3
-        with: 
+        with:
           submodules: true
           token: ${{ secrets.PAT_GITHUB }}
 
       - name: Update Java
         uses: actions/setup-java@v2
-        with: 
-          distribution: 'zulu' 
-          java-version: '16'
+        with:
+          distribution: "zulu"
+          java-version: "16"
 
       - name: Installing pre-requisites
         run: |
@@ -43,14 +43,14 @@ jobs:
           mkdir bin
           cp premake5 bin/premake5
           sudo chmod a+x premake5
-          sudo mv premake5 /usr/local/bin      
+          sudo mv premake5 /usr/local/bin
       - name: Build skia files
         run: ./scripts/build.skia.sh -a ${{ matrix.arch }}
 
   run_tests:
     name: Run Rive tests
     needs: build-skia
-    runs-on: macos-12
+    runs-on: [self-hosted, macOS, ARM64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -67,9 +67,8 @@ jobs:
           mkdir bin
           cp premake5 bin/premake5
           sudo chmod a+x premake5
-          sudo mv premake5 /usr/local/bin      
+          sudo mv premake5 /usr/local/bin
       - name: Build everything (using the cache, we should make an archive of course)
         run: ./scripts/build.sh ios_sim debug
       - name: Testing iOS app
         run: ./scripts/test.sh
-  
\ No newline at end of file
diff --git a/.rive_head b/.rive_head
index 51051121..0470aa77 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-90245a5e1ec77c7b9dfff51a7d242d8d21b18395
+3be5ff0d873280d2bcec300fb764f016ac96a08d
diff --git a/submodules/rive-cpp b/submodules/rive-cpp
index 3308052c..b89a610e 160000
--- a/submodules/rive-cpp
+++ b/submodules/rive-cpp
@@ -1 +1 @@
-Subproject commit 3308052c9361863ec799930fb3522b927d1a431f
+Subproject commit b89a610eb7ee766d26d01f062db41d2780eb853f