diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e27143..d6ac5e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,8 +47,10 @@ jobs:
           shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }}
           save-if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
       
-      - name: Build and test (Makefile linux-arm64)
+      - name: Build (Makefile linux-arm64)
         run: make linux-arm64
+      - name: Run tests
+        run: make tests
 
   macos-arm64:
     name: macOS arm64
diff --git a/Cargo.toml b/Cargo.toml
index 25f8392..ae892eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -245,7 +245,7 @@ system-alloc  = []                # forces System allocator
 pretty_assertions = "1.4"
 temp-env = "0.3.6"
 wiremock = "0.6.5"
-git2 = "0.20.3"
+git2 = { version = "0.20.3", default-features = false }
 rand_chacha = "0.9.0"
 testcontainers = "0.15.0"
 
diff --git a/Makefile b/Makefile
index 5ef842a..ae146fe 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ linux-x64: check-docker create-dockerignore
 		    xz-dev    xz-static \
 		    boost-dev linux-headers \
 		    patch perl ragel \
-		    git openssl-dev curl && \
+		    git curl && \
 		\
 		cargo test --workspace --all-targets ; \
 		\
@@ -276,37 +276,7 @@ linux-x64: check-docker create-dockerignore
 	'
 	$(MAKE) list-archives
 
-linux-arm64: check-docker create-dockerignore
-	@mkdir -p target/release
-	docker run --platform linux/arm64 --rm \
-          -e CARGO_HOME=/src/.cargo-home \
-          -v "$$(pwd):/src" -w /src rust:1.92-alpine sh -eu -c '\
-                mkdir -p /src/.cargo-home && \
-		apk add --no-cache \
-		    musl-dev \
-		    gcc g++ make cmake pkgconfig \
-		    zlib-dev  zlib-static \
-		    bzip2-dev bzip2-static \
-		    xz-dev    xz-static \
-		    boost-dev linux-headers \
-		    patch perl ragel \
-		    git openssl-dev curl && \
-		\
-		rustup target add aarch64-unknown-linux-musl && \
-		\
-		cargo test --workspace --all-targets ; \
-		\
-		export PKG_CONFIG_ALLOW_CROSS=1 ; \
-		export RUSTFLAGS="-C target-feature=+crt-static" ; \
-		\
-		cargo build --release --target aarch64-unknown-linux-musl && \
-		\
-		cd target/aarch64-unknown-linux-musl/release && \
-	    sha256sum kingfisher > CHECKSUM.txt && \
-	    tar -czf /src/target/release/kingfisher-linux-arm64.tgz \
-	        kingfisher CHECKSUM.txt \
-	'
-	$(MAKE) list-archives
+linux-arm64: ubuntu-arm64
 
 
 # =============  AGGREGATE TARGETS  =============