diff --git a/Dockerfile.linux b/Dockerfile.linux
index 9688402..a5d2ef7 100644
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -28,11 +28,12 @@ run apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 # Make binary name configurable
-arg BINARY_NAME=WatcherAgent
+ARG BINARY_NAME
+ENV BINARY_NAME=${BINARY_NAME:-WatcherAgent}  # Default falls nicht gesetzt
 copy --from=linux-builder /app/target/x86_64-unknown-linux-gnu/release/$BINARY_NAME /usr/local/bin/
 
 # Verify binary works
-run /usr/local/bin/$BINARY_NAME --version
+run chmod +x /usr/local/bin/${BINARY_NAME} && /usr/local/bin/${BINARY_NAME} --version
 
 # Health check
 healthcheck --interval=30s --timeout=3s \