diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b763886..55433f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,16 +24,19 @@ jobs:
       fail-fast: false
       matrix:
         platform:
+          - linux-arm
           - linux-x64
-          - macos-arm64
+          - macos-arm
           - macos-x64
           - windows-x64
 
         include:
+          - platform: linux-arm
+            os: ubuntu-24.04-arm
           - platform: linux-x64
-            os: ubuntu-22.04
-          - platform: macos-arm64
-            os: macos-14
+            os: ubuntu-latest
+          - platform: macos-arm
+            os: macos-15
           - platform: macos-x64
             os: macos-13
           - platform: windows-x64
@@ -54,7 +57,7 @@ jobs:
           tool: cargo-llvm-cov
 
       - name: Tests
-        if: ${{ !startsWith(matrix.os, 'ubuntu-') }}
+        if: ${{ matrix.platform != 'linux-x64' }}
         env:
           CARGO_TERM_COLOR: always
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -64,7 +67,7 @@ jobs:
           cargo test
 
       - name: Tests
-        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
+        if: ${{ matrix.platform == 'linux-x64' }}
         env:
           CARGO_TERM_COLOR: always
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -74,7 +77,7 @@ jobs:
           cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
 
       - name: Upload to codecov.io
-        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
+        if: ${{ matrix.platform == 'linux-x64' }}
         uses: codecov/codecov-action@v4
         with:
           files: lcov.info
@@ -84,11 +87,11 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Install benchmarking tools
-        if: ${{ github.ref == 'refs/heads/main' && startsWith(matrix.os, 'ubuntu-') }}
+        if: ${{ github.ref == 'refs/heads/main' && matrix.platform == 'linux-x64' }}
         uses: bencherdev/bencher@main
 
       - name: Run benchmarks
-        if: ${{ github.ref == 'refs/heads/main' && startsWith(matrix.os, 'ubuntu-') }}
+        if: ${{ github.ref == 'refs/heads/main' && matrix.platform == 'linux-x64' }}
         env:
           BENCHER_API_TOKEN: ${{ secrets.BENCHER_API_TOKEN }}
           BENCHER_PROJECT: theseus-rs-postgresql-embedded
diff --git a/postgresql_extensions/tests/portal_corp.rs b/postgresql_extensions/tests/portal_corp.rs
index c181d4f..214532e 100644
--- a/postgresql_extensions/tests/portal_corp.rs
+++ b/postgresql_extensions/tests/portal_corp.rs
@@ -1,4 +1,7 @@
-#[cfg(not(all(target_os = "macos", target_arch = "x86_64")))]
+#[cfg(not(any(
+    all(target_os = "linux", target_arch = "aarch64"),
+    all(target_os = "macos", target_arch = "x86_64")
+)))]
 #[cfg(feature = "portal-corp")]
 #[tokio::test]
 async fn test_lifecycle() -> anyhow::Result<()> {