diff --git a/.github/workflows/build-and-integration-tests.yml b/.github/workflows/build-and-integration-tests.yml
index fb4ef2e9..c06931ab 100644
--- a/.github/workflows/build-and-integration-tests.yml
+++ b/.github/workflows/build-and-integration-tests.yml
@@ -55,12 +55,24 @@ jobs:
             use-cross: true
             test: false
             debug_build_args: --no-default-features --features rustls
+          - target: armv7-unknown-linux-gnueabihf
+            os: ubuntu-20.04
+            output: cargo-binstall
+            use-cross: true
+            test: false
+            debug_build_args: --no-default-features --features rustls
           - target: aarch64-unknown-linux-musl
             os: ubuntu-latest
             output: cargo-binstall
             use-cross: true
             test: false
             debug_build_args: --no-default-features --features rustls
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-latest
+            output: cargo-binstall
+            use-cross: true
+            test: false
+            debug_build_args: --no-default-features --features rustls
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/Cross.toml b/Cross.toml
index 7b36bf82..7679dc71 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,11 +1,2 @@
-[target.armv7-unknown-linux-gnueabihf]
-zig = true
-
-[target.armv7-unknown-linux-musleabihf]
-zig = true
-
-[target.aarch64-unknown-linux-gnu]
-zig = true
-
-[target.aarch64-unknown-linux-musl]
+[build]
 zig = true