diff --git a/justfile b/justfile
index 0949e49aebf3a56c0e9bd51272d3bd822e37232e..995314418d432d3fa593bfb9f6710f14adc60152 100644
--- a/justfile
+++ b/justfile
@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
+GOOS := env("GOOS", `go env GOOS`)
+GOARCH := env("GOARCH", `go env GOARCH`)
+
 default: fmt lint staticcheck test vuln reuse
 
 fmt:
@@ -33,7 +36,7 @@ reuse:
 
 build:
     # Building lunatask-mcp-server
-    CGO_ENABLED=0 go build -o lunatask-mcp-server -ldflags "-s -w -X main.version=`git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g'`" .
+    CGO_ENABLED=0 GOOS={{GOOS}} GOARCH={{GOARCH}} go build -o lunatask-mcp-server -ldflags "-s -w -X main.version=`git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g'`" .
 
 clean:
     # Removing build artifacts