diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0b65276..3338c91 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,11 +1,8 @@
 name: Main
-
 on: push
-
 env:
     REGISTRY: ghcr.io
     IMAGE_NAME: ${{ github.repository }}
-
 jobs:
     build-and-publish:
         runs-on: ubuntu-latest
@@ -15,24 +12,20 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v6
-
             - name: Prepare java
               uses: actions/setup-java@v3
               with:
                   distribution: "adopt"
                   java-version: "22"
-
             - name: Install clojure tools
               uses: DeLaGuardo/setup-clojure@13.4
               with:
                   cli: latest
-
             - name: Build bot and copy out jar for docker
               shell: bash
               run: |
                   clojure -T:build uber
                   cp target/doplarr.jar docker
-
             - name: Release tagged version
               uses: softprops/action-gh-release@v2
               if: startsWith(github.ref, 'refs/tags/')
@@ -40,24 +33,27 @@ jobs:
                   files: |
                       target/doplarr.jar
                       config.edn
-
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v3
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
             - name: Log in to the Container registry
               uses: docker/login-action@v3
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
-
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
             - name: Build and push Docker image
               uses: docker/build-push-action@v6
               with:
-                  context: docker
+                  context: .
+                  file: docker/Dockerfile
+                  platforms: linux/amd64,linux/arm64
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bb3bd2d..1523ed2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,17 +1,3 @@
-FROM clojure:tools-deps AS builder
-
-WORKDIR /src
-
-# Copy dependency files first for better caching
-COPY deps.edn .
-COPY build ./build
-
-# Copy source code
-COPY src ./src
-
-# Build uberjar
-RUN clj -T:build uber
-
 FROM eclipse-temurin:22_36-jre-alpine AS runtime
 
 WORKDIR /app
@@ -21,7 +7,7 @@ RUN apk add --no-cache \
     tini \
     tzdata
 
-COPY --from=builder /src/target/doplarr.jar .
+COPY target/doplarr.jar .
 
 ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["java", "-jar", "/app/doplarr.jar"]