diff --git a/core/auth/hydra/Dockerfile b/core/auth/hydra/Dockerfile
index 96ec8fa..ba49668 100644
--- a/core/auth/hydra/Dockerfile
+++ b/core/auth/hydra/Dockerfile
@@ -1,5 +1,7 @@
 FROM alpine:3.14.2
 
+ARG TARGETARCH
+
 RUN addgroup -S ory; \
     adduser -S ory -G ory -D -u 10000 -h /home/ory -s /bin/nologin; \
     chown -R ory:ory /home/ory
@@ -7,7 +9,13 @@
 RUN apk add -U --no-cache ca-certificates
 
 WORKDIR /downloads
-RUN wget https://github.com/ory/hydra/releases/download/v1.10.6/hydra_1.10.6_linux_arm64.tar.gz -O hydra.tar.gz
+RUN if [[ "${TARGETARCH}" == "amd64" ]]; \
+    then \
+      wget https://github.com/ory/hydra/releases/download/v1.10.6/hydra_1.10.6_linux_64bit.tar.gz -O hydra.tar.gz ; \
+    else \
+      wget https://github.com/ory/hydra/releases/download/v1.10.6/hydra_1.10.6_linux_${TARGETARCH}.tar.gz -O hydra.tar.gz ; \
+    fi
+
 RUN tar -xvf hydra.tar.gz
 RUN mv hydra /usr/bin
 
diff --git a/core/auth/hydra/Makefile b/core/auth/hydra/Makefile
index 6a91678..b0914b7 100644
--- a/core/auth/hydra/Makefile
+++ b/core/auth/hydra/Makefile
@@ -1,5 +1,2 @@
-image_arm64:
-	docker build --tag=giolekva/ory-hydra:latest . --platform=linux/arm64
-
-push_arm64: image_arm64
-	docker push giolekva/ory-hydra:latest
+push:
+	docker buildx build --tag=giolekva/ory-hydra:latest . --platform=linux/arm64,linux/amd64 --push