diff --git a/Dockerfile.scanner b/Dockerfile.scanner
index cd98d8c..ae7b75f 100644
--- a/Dockerfile.scanner
+++ b/Dockerfile.scanner
@@ -1,4 +1,7 @@
 # Scanning Engine - Background Scanner Worker
+ARG TARGETOS
+ARG TARGETARCH
+
 FROM alpine:latest
 
 # Install scanning tools and runtime dependencies
@@ -29,8 +32,10 @@ RUN addgroup -g 1000 scanner && \
 RUN mkdir -p /data/cache /data/scans && \
     chown -R scanner:scanner /data
 
-# Copy binary
-COPY gohoarder /usr/local/bin/gohoarder
+# Copy binary (from platform-specific path)
+ARG TARGETOS
+ARG TARGETARCH
+COPY ${TARGETOS}/${TARGETARCH}/gohoarder /usr/local/bin/gohoarder
 RUN chmod +x /usr/local/bin/gohoarder
 
 # Copy example config
diff --git a/Dockerfile.server b/Dockerfile.server
index 6a8d039..089eb34 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -1,4 +1,7 @@
 # Application Engine - GoHoarder Server
+ARG TARGETOS
+ARG TARGETARCH
+
 FROM alpine:latest
 
 # Install runtime dependencies
@@ -15,8 +18,10 @@ RUN addgroup -g 1000 gohoarder && \
 RUN mkdir -p /data/cache /data/metadata && \
     chown -R gohoarder:gohoarder /data
 
-# Copy binary
-COPY gohoarder /usr/local/bin/gohoarder
+# Copy binary (from platform-specific path)
+ARG TARGETOS
+ARG TARGETARCH
+COPY ${TARGETOS}/${TARGETARCH}/gohoarder /usr/local/bin/gohoarder
 RUN chmod +x /usr/local/bin/gohoarder
 
 # Copy example config