diff --git a/source/Dockerfile b/source/Dockerfile
index 8ae08c9..f8d0f31 100644
--- a/source/Dockerfile
+++ b/source/Dockerfile
@@ -1,5 +1,9 @@
 FROM --platform=$BUILDPLATFORM alpine:latest AS builder
 
+# Add build arguments for platform
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
 # Install build dependencies
 RUN apk add --no-cache \
     build-base \
@@ -27,7 +31,8 @@ RUN cmake -G Ninja -B build_static -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_CXX_COMPILER=g++ \
     -DCMAKE_EXE_LINKER_FLAGS="-static" \
     -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
-    -DBUILD_SHARED_LIBS=OFF
+    -DBUILD_SHARED_LIBS=OFF \
+    -DCMAKE_SYSTEM_PROCESSOR=${TARGETPLATFORM#linux/}
 
 RUN cmake --build build_static
 
diff --git a/source/build_static.sh b/source/build_static.sh
index 8575951..5807935 100755
--- a/source/build_static.sh
+++ b/source/build_static.sh
@@ -8,6 +8,8 @@ docker buildx create --name multiarch-builder --use || true
 
 # Build for amd64
 docker buildx build --platform linux/amd64 \
+    --build-arg TARGETPLATFORM=linux/amd64 \
+    --build-arg BUILDPLATFORM=linux/amd64 \
     --tag dropshell-static-builder \
     --output type=local,dest=./output/amd64 \
     --target dropshell \
@@ -15,6 +17,8 @@ docker buildx build --platform linux/amd64 \
 
 # Build for arm64
 docker buildx build --platform linux/arm64 \
+    --build-arg TARGETPLATFORM=linux/arm64 \
+    --build-arg BUILDPLATFORM=linux/amd64 \
     --tag dropshell-static-builder \
     --output type=local,dest=./output/arm64 \
     --target dropshell \