diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b5fa21a..e1ed8c4 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -21,4 +21,3 @@ jobs:
   build:
     name: Build
     uses: aukilabs/go-tooling/.github/workflows/build.yml@main
-
diff --git a/Dockerfile b/Dockerfile
index 5b4c707..a43395e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,9 @@ FROM --platform=$BUILDPLATFORM golang:1.21 as build
 RUN mkdir -p /app/bin
 WORKDIR /app
 ADD . /app
-ARG TARGETOS
-ARG TARGETARCH
+ARG TARGETOS TARGETARCH TARGETVARIANT
 ARG VERSION
-RUN make GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" VERSION="${VERSION}" bin/hagall
+RUN make GOOS="${TARGETOS}" GOARCH="${TARGETARCH}" arm_version="${TARGETVARIANT}" VERSION="${VERSION}" bin/hagall
 
 ##
 ## Run-time
diff --git a/Makefile b/Makefile
index 2d29234..1ecd836 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ help: go-build
 test: go-normalize
 	@go test -p 1 ./...
 
-clean: services-stop go-tidy
+clean: go-tidy
 	@-rm -rf bin
 	@-rm -rf vendor
 
@@ -62,7 +62,7 @@ else
 endif
 
 bin/hagall: go-vendor
-	CGO_ENABLED=0 go build -mod vendor -ldflags "-X main.version=${VERSION}" -o ./bin/hagall ./cmd
+	CGO_ENABLED=0 GOARM="$$(echo "$$arm_version" | cut -c 2-)" go build -mod vendor -ldflags "-X main.version=${VERSION}" -o ./bin/hagall ./cmd
 
 integration-tests:
 	@pip3 install -q web3