diff --git a/Makefile b/Makefile
index e5d15d3..1dde474 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ test-container: image-dev ## Run a command in a test container with all the need
 	@:$(call check_defined, CMD, command to run in the container)
 	docker run $(DOCKER_FLAGS) \
 		$(REGISTRY)/$(NAME):dev \
-		$(CMD)
+		"$(CMD)"
 
 GRPC_API_DIR=api/grpc
 .PHONY:protoc
diff --git a/basic.mk b/basic.mk
index 61567b5..288660e 100644
--- a/basic.mk
+++ b/basic.mk
@@ -20,7 +20,7 @@ ifeq ($(GITCOMMIT),)
 endif
 CTIMEVAR=-X $(PKG)/version.GITCOMMIT=$(GITCOMMIT) -X $(PKG)/version.VERSION=$(VERSION)
 GO_LDFLAGS=-ldflags "-w $(CTIMEVAR)"
-GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR) -extldflags -static"
+GO_LDFLAGS_STATIC=-ldflags "-w $(CTIMEVAR)"
 
 # Set our default go compiler
 GO := go