diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0da2c9c..a1ff775 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,21 +14,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        nif: ["2.16", "2.15"]
+        nif: ["2.16", "2.17"]
         job:
-          - {
-              target: arm-unknown-linux-gnueabihf,
-              os: ubuntu-20.04,
-              use-cross: true,
-            }
-          - {
-              target: aarch64-unknown-linux-gnu,
-              os: ubuntu-20.04,
-              use-cross: true,
-            }
-          - { target: aarch64-apple-darwin, os: macos-12 }
-          - { target: x86_64-apple-darwin, os: macos-12 }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
+          - { target: aarch64-apple-darwin        , os: macos-11      }
+          - { target: aarch64-unknown-linux-gnu   , os: ubuntu-20.04 , use-cross: true }
+          - { target: aarch64-unknown-linux-musl  , os: ubuntu-20.04 , use-cross: true }
+          - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04 , use-cross: true }
+          - { target: riscv64gc-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true }
+          - { target: x86_64-apple-darwin         , os: macos-11      }
+          - { target: x86_64-pc-windows-gnu       , os: windows-2019  }
+          - { target: x86_64-pc-windows-msvc      , os: windows-2019  }
+          - { target: x86_64-unknown-linux-gnu    , os: ubuntu-20.04  }
+          - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04 , use-cross: true }
 
     steps:
       - name: Checkout source code
@@ -46,6 +43,22 @@ jobs:
           toolchain: stable
           target: ${{ matrix.job.target }}
 
+      - name: Download cross from GitHub releases
+        uses: giantswarm/install-binary-action@v1.0.0
+        if: ${{ matrix.job.use-cross && matrix.job.target != 'aarch64-unknown-linux-musl' }}
+        with:
+          binary: "cross"
+          version: "v0.2.1"
+          download_url: "https://github.com/rust-embedded/cross/releases/download/${version}/cross-${version}-x86_64-unknown-linux-gnu.tar.gz"
+          tarball_binary_path: "${binary}"
+          smoke_test: "${binary} --version"
+
+      - name: Install cross from GitHub
+      if: ${{ matrix.job.use-cross && matrix.job.target == 'aarch64-unknown-linux-musl' }}
+      shell: bash
+      run: |
+        cargo install --git https://github.com/cross-rs/cross --rev 4deac830a4992a70f7cb070eda38d5ff7cfcbf86 || echo 'Already installed'
+
       - name: Build the project
         id: build-crate
         uses: philss/rustler-precompiled-action@v1.1.4