diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc21ff7b341..2f83a1b2ed8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
             use_llvm: true
             build_wasm: false
           - build: macos-arm64
-            os: macos-11.0
+            os: macos-14
             target: aarch64-apple-darwin
             artifact_name: 'wasmer-darwin-arm64'
             use_sccache: false
@@ -186,17 +186,9 @@ jobs:
           echo 'RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache' >> $GITHUB_ENV
         shell: bash
       - name: Build C API headless
-        if: matrix.build != 'macos-arm64'
         shell: bash
         run: |
           make package-capi-headless
-      - name: Build C API headless
-        if: matrix.build == 'macos-arm64'
-        run: |
-          make package-capi-headless
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Build C API
         shell: bash
         run: |
@@ -244,16 +236,8 @@ jobs:
           make build-wasmer-headless-minimal
           rustup override unset
       - name: Dist
-        if: matrix.build != 'macos-arm64'
         run: |
           make distribution
-      - name: Dist macos-arm64
-        if: matrix.build == 'macos-arm64'
-        run: |
-          make distribution
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8223648b15b..1acfdc144d0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -551,6 +551,12 @@ jobs:
             exe: '',
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
           },
+          {
+            build: macos-arm64,
+            os: macos-14,
+            target: aarch64-apple-darwin,
+            exe: '',
+          },
           {
             build: windows-x64,
             os: windows-2019,
diff --git a/tests/compilers/artifact.rs b/tests/compilers/artifact.rs
index 26d0ca45b94..d619730d940 100644
--- a/tests/compilers/artifact.rs
+++ b/tests/compilers/artifact.rs
@@ -53,6 +53,7 @@ fn artifact_serialization_build() {
 }
 
 #[test]
+#[cfg(target_arch = "x86_64")]
 fn artifact_deserialization_roundtrip() {
     // This test is included to make sure we don't break the serialized format
     // by mistake. Otherwise, everything in this test is already tested in