diff --git a/Makefile b/Makefile
index 3d1c4bf..5eb5f64 100755
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ stop-docker-compose-test:
 	docker compose down -v
 
 build:
-	go mod vendor
-	go build -o build/client client/main.go
-	go build -o build/agent agent/main.go
+	go mod download
+	CGO_ENABLED=0 go build -o build/client client/main.go
+	CGO_ENABLED=0 go build -o build/agent agent/main.go
 
 clean:
 	rm -rf build
diff --git a/dockerfiles/agent/Dockerfile b/dockerfiles/agent/Dockerfile
index 67f5be8..0d65473 100755
--- a/dockerfiles/agent/Dockerfile
+++ b/dockerfiles/agent/Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /
 COPY ./ ./
 
 RUN go mod download
-RUN go build -o ./build/agent agent/main.go
+RUN CGO_ENABLED=0 go build -o ./build/agent agent/main.go
 
 FROM scratch
 COPY --from=builder ./build/agent agent
diff --git a/dockerfiles/client/Dockerfile b/dockerfiles/client/Dockerfile
index 888a56b..9cdb543 100755
--- a/dockerfiles/client/Dockerfile
+++ b/dockerfiles/client/Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /
 COPY ./ ./
 
 RUN go mod download
-RUN go build -o ./build/client client/main.go
+RUN CGO_ENABLED=0 go build -o ./build/client client/main.go
 
 FROM scratch
 COPY --from=builder ./build/client client