diff --git a/Dockerfile b/Dockerfile
index 8f8be5a..15086dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build a small image
-FROM arm32v7/alpine:3.12
+FROM arm64v8/alpine:3.14
 
 RUN apk add --no-cache su-exec restic postgresql-client
 COPY bin/formolcli /usr/local/bin
diff --git a/Makefile b/Makefile
index d0c8f9a..c64d981 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 IMG ?= desmo999r/formolcli:latest
 
 formolcli: fmt vet
-	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -o bin/formolcli main.go
+	GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o bin/formolcli main.go
 
 test: fmt vet
 	go test ./... -coverprofile cover.out