diff --git a/.github/workflows/docker-on-push.yml b/.github/workflows/docker-on-push.yml
index 57d2c42..8e5a593 100644
--- a/.github/workflows/docker-on-push.yml
+++ b/.github/workflows/docker-on-push.yml
@@ -12,9 +12,6 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -29,7 +26,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
           push: true
           tags: |
             ghcr.io/${{ github.repository }}:master
diff --git a/Dockerfile b/Dockerfile
index 0a744a3..6259e3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,15 @@
-FROM golang:alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS builder
 
 WORKDIR /steamsalty
 
 RUN apk update && apk add --no-cache ca-certificates 
 
-COPY . .
+COPY go.mod go.sum ./
 RUN go mod download
-RUN go build -o /app/steamsalty
+
+COPY . .
+ARG TARGETOS TARGETARCH
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /app/steamsalty
 
 
 
@@ -18,4 +21,4 @@ COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
 
 COPY --from=builder /app/steamsalty /app/steamsalty
 
-ENTRYPOINT ["/app/steamsalty"]
\ No newline at end of file
+ENTRYPOINT ["/app/steamsalty"]