diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6b441575..32a12e2d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/s390x
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a0721cba..64233760 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,23 @@
 FROM golang:1.21 as builder
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+LABEL org.opencontainers.image.source = https://github.com/cloudflare/gokeyless
+LABEL org.opencontainers.image.description = "Cloudflare's Gokeyless"
+
+ARG TARGETOS
+ARG TARGETARCH
+
 WORKDIR /gokeyless
 COPY . .
-RUN env GOOS=linux GOARCH=amd64 make gokeyless
+RUN env GOOS=${TARGETOS} GOARCH=${TARGETARCH} make gokeyless
 
 FROM golang:1.21
 WORKDIR /gokeyless
 COPY --from=builder /gokeyless/gokeyless gokeyless
-ENTRYPOINT ["./gokeyless"]
\ No newline at end of file
+ENTRYPOINT ["./gokeyless"]
+
+
+