diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 337d81f..58bf1c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,4 @@
 name: Docker Build
-
 on:
   push:
     branches:
@@ -15,7 +14,7 @@ env:
   IMAGE_NAME: veirt/vesta-test
 
 jobs:
-  docker:
+  build:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -47,14 +46,26 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=sha
 
-      - name: Build and push
+      - name: Build and push x86_64
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.x86_64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          platforms: linux/amd64
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push aarch64
         uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile.aarch64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 162c17f..5cca25a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -7,18 +7,17 @@ COPY gridPlugin.js tailwind.config.js ./
 COPY src ./src
 RUN bunx tailwindcss -i ./src/style.css -o ./out.css --minify
 
-FROM --platform=$BUILDPLATFORM rust:1.80-alpine AS build
+FROM --platform=$BUILDPLATFORM rust:1.80 AS build
 
-RUN apk add --no-cache \
-    musl-dev \
-    build-base \
-    llvm \
-    clang
+RUN apt-get update && apt-get install -y \
+    musl-tools \
+    gcc-aarch64-linux-gnu \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN rustup target add aarch64-unknown-linux-musl
 
-ENV CC_aarch64_unknown_linux_musl=clang \
-    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=clang
+ENV CC_aarch64_unknown_linux_musl=aarch64-linux-gnu-gcc \
+    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc
 
 WORKDIR /usr/src
 RUN USER=root cargo new --bin vesta
diff --git a/Dockerfile b/Dockerfile.x86_64
similarity index 88%
rename from Dockerfile
rename to Dockerfile.x86_64
index e1277f7..d8d33f0 100644
--- a/Dockerfile
+++ b/Dockerfile.x86_64
@@ -3,13 +3,13 @@ WORKDIR /temp
 COPY package.json bun.lockb ./
 RUN bun install --frozen-lockfile
 
-COPY tailwind.config.js .
+COPY gridPlugin.js tailwind.config.js ./
 COPY src ./src
 RUN bunx tailwindcss -i ./src/style.css -o ./out.css --minify
 
 FROM rust:1.80-alpine AS build
 
-RUN apk add musl-dev --no-cache
+RUN apk add --no-cache musl-dev
 
 WORKDIR /usr/src
 RUN USER=root cargo new --bin vesta