diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ff642a2..113f574 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -1,9 +1,9 @@
-# This file is autogenerated by maturin v1.5.1
+# This file is (mostly) autogenerated by maturin v1.5.1
 # To update, run
 #
 #    maturin generate-ci github -m arro3-core/Cargo.toml
 #
-name: CI
+name: Build wheels
 
 on:
   push:
@@ -34,6 +34,9 @@ jobs:
             target: s390x
           - runner: ubuntu-latest
             target: ppc64le
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -43,13 +46,13 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
           manylinux: auto
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.platform.target }}
+          name: wheels-linux-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   windows:
@@ -61,6 +64,9 @@ jobs:
             target: x64
           - runner: windows-latest
             target: x86
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -71,12 +77,12 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.platform.target }}
+          name: wheels-windows-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   macos:
@@ -88,6 +94,9 @@ jobs:
             target: x86_64
           - runner: macos-14
             target: aarch64
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -97,27 +106,32 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.platform.target }}
+          name: wheels-macos-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   sdist:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
-          args: --out dist --manifest-path arro3-core/Cargo.toml
+          args: --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-sdist
+          name: wheels-sdist-${{ matrix.module }}
           path: dist
 
   # release:
diff --git a/Cargo.toml b/Cargo.toml
index 60f2828..9145945 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = ["arro3-compute", "arro3-core", "arro3-internal"]
+resolver = "2"
 
 [workspace.dependencies]
 arrow = { version = "52", features = ["ffi"] }