diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b2e608..f36fbc1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,9 +33,10 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and Push Native Image (multi-platform)
+      - name: Create multi-platform image
         run: |
-          pack build --builder paketobuildpacks/builder-jammy-full:latest \
-            --tag dalbodeule/chzzkbot:latest \
+          docker buildx create --use
+          docker buildx build --platform linux/amd64,linux/arm64 \
             --tag dalbodeule/chzzkbot:${{ env.DATETIME }} \
-            --publish
\ No newline at end of file
+            --tag dalbodeule/chzzkbot:latest \
+            --push .
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index fb350c4..2a78946 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder Stage
-FROM gradle:jdk-21-and-22-graal AS builder
+FROM ghcr.io/graalvm/graalvm-ce:22.3.3 AS builder
 
 # Set working directory
 WORKDIR /app
@@ -18,6 +18,7 @@ RUN ./gradlew --no-daemon dependencies
 COPY src ./src
 
 # Build the application
+RUN ./gradlew build
 RUN ./gradlew nativeCompile
 
 # Runner Stage
diff --git a/build.gradle.kts b/build.gradle.kts
index f91fbff..8378557 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,7 @@ graalvmNative {
         named("main") {
             useFatJar.set(true)
             sharedLibrary.set(false)
-            buildArgs.add("--initialize-at-build-time=org.hibernate.*")
+            buildArgs.add("-march=compatibility")
         }
     }
     metadataRepository {