diff --git a/core/auth/hydra-maester/Dockerfile b/core/auth/hydra-maester/Dockerfile
index 072d9b2..585f9af 100644
--- a/core/auth/hydra-maester/Dockerfile
+++ b/core/auth/hydra-maester/Dockerfile
@@ -1,4 +1,5 @@
 FROM gcr.io/distroless/static:latest
-COPY hydra-maester/manager .
+ARG TARGETARCH
+COPY hydra-maester/manager_${TARGETARCH} /manager
 USER 1000
 ENTRYPOINT ["/manager"]
diff --git a/core/auth/hydra-maester/Makefile b/core/auth/hydra-maester/Makefile
index 970da58..98453ac 100644
--- a/core/auth/hydra-maester/Makefile
+++ b/core/auth/hydra-maester/Makefile
@@ -1,15 +1,23 @@
+clean: rm -rf hydra-maester/manager_*
+
 clone:
 	git clone --depth 1 --branch v0.0.20 https://github.com/ory/hydra-maester.git
 
-push_arm64: export GOOS=linux
-push_arm64: export GOARCH=arm64
-push_arm64: export CGO_ENABLED=0
-push_arm64: export GO111MODULE=on
-build:
-	cd hydra-maester && go build -o manager main.go
+build_arm64: export CGO_ENABLED=0
+build_arm64: export GO111MODULE=on
+build_arm64: export GOOS=linux
+build_arm64: export GOARCH=arm64
+build_arm64:
+	cd hydra-maester && go build -o manager_arm64 main.go
 
-image_arm64: build
-	docker build --tag=giolekva/ory-hydra-maester:latest . --platform=linux/arm64
+build_amd64: export CGO_ENABLED=0
+build_amd64: export GO111MODULE=on
+build_amd64: export GOOS=linux
+build_amd64: export GOARCH=amd64
+build_amd64:
+	cd hydra-maester && go build -o manager_amd64 main.go
 
-push_arm64: image_arm64
-	docker push giolekva/ory-hydra-maester:latest
+build: clean build_arm64 build_amd64
+
+push: build
+	docker buildx build --tag=giolekva/ory-hydra-maester:latest . --platform=linux/arm64,linux/amd64 --push