diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a7a23586..4dccc5e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,3 +55,32 @@ jobs:
         asset_path: traefik-forward-auth_arm
         asset_name: traefik-forward-auth_arm
         asset_content_type: application/octet-stream
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ghcr.io/${{ github.repository_owner }}/traefik-forward-auth
+        tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build
+      uses: docker/bake-action@v4
+      with:
+        files: |
+          ./docker-bake.hcl
+          ${{ steps.meta.outputs.bake-file }}
+        push: true
diff --git a/Dockerfile b/Dockerfile
index 80fe861c..57882f1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,17 @@
-FROM golang:1.20-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as builder
 
 # Setup
-RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
 WORKDIR /go/src/github.com/thomseddon/traefik-forward-auth
 
-# Add libraries
-RUN apk add --no-cache git
+# Install deps
+COPY go.mod /go/src/github.com/thomseddon/traefik-forward-auth/
+COPY go.sum /go/src/github.com/thomseddon/traefik-forward-auth/
+RUN go mod download
 
 # Copy & build
 ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd
+ARG TARGETOS TARGETARCH
+RUN CGO_ENABLED=0  GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd
 
 # Copy into scratch container
 FROM scratch
diff --git a/Dockerfile.arm b/Dockerfile.arm
deleted file mode 100644
index e10021e6..00000000
--- a/Dockerfile.arm
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM golang:1.13-alpine as builder
-
-# Setup
-RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
-WORKDIR /go/src/github.com/thomseddon/traefik-forward-auth
-
-# Add libraries
-RUN apk add --no-cache git
-
-# Copy & build
-ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd
-
-# Copy into scratch container
-FROM scratch
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /traefik-forward-auth ./
-ENTRYPOINT ["./traefik-forward-auth"]
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
deleted file mode 100644
index a9806863..00000000
--- a/Dockerfile.arm64
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM golang:1.13-alpine as builder
-
-# Setup
-RUN mkdir -p /go/src/github.com/thomseddon/traefik-forward-auth
-WORKDIR /go/src/github.com/thomseddon/traefik-forward-auth
-
-# Add libraries
-RUN apk add --no-cache git
-
-# Copy & build
-ADD . /go/src/github.com/thomseddon/traefik-forward-auth/
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GO111MODULE=on go build -a -installsuffix nocgo -o /traefik-forward-auth github.com/thomseddon/traefik-forward-auth/cmd
-
-# Copy into scratch container
-FROM scratch
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /traefik-forward-auth ./
-ENTRYPOINT ["./traefik-forward-auth"]
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 00000000..200b66aa
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,12 @@
+target "docker-metadata-action" {}
+
+target "default" {
+  inherits = ["docker-metadata-action"]
+  context = "./"
+  dockerfile = "Dockerfile"
+  platforms = [
+    "linux/amd64",
+    "linux/arm",
+    "linux/arm64"
+  ]
+}
\ No newline at end of file