diff --git a/Makefile b/Makefile
index fdf6b44b1f..f85b42c1a3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ BUILD_FLAGS	= -X github.com/cs3org/reva/cmd/revad.gitCommit=$(GIT_COMMIT) -X git
 
 .PHONY: revad
 revad:
-	go build -ldflags "-extldflags=-static $(BUILD_FLAGS)" -o ./cmd/revad/revad ./cmd/revad/main
+	go build -ldflags "$(BUILD_FLAGS)" -o ./cmd/revad/revad ./cmd/revad/main
 
 .PHONY: gaia
 gaia:
@@ -50,11 +50,11 @@ cernbox-revad: gaia
 	gaia build --with github.com/cernbox/reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad
 .PHONY: revad-ceph
 revad-ceph:
-	go build -ldflags "$(BUILD_FLAGS)" -tags ceph -o ./cmd/revad/revad ./cmd/revad/main
+	go build -ldflags "-extldflags=-static $(BUILD_FLAGS)" -tags ceph -o ./cmd/revad/revad ./cmd/revad/main
 
 .PHONY: reva
 reva:
-	go build -ldflags "-extldflags=-static $(BUILD_FLAGS)" -o ./cmd/reva/reva ./cmd/reva
+	go build -ldflags "$(BUILD_FLAGS)" -o ./cmd/reva/reva ./cmd/reva
 
 .PHONY: docker-reva
 docker-reva: