diff --git a/Makefile b/Makefile
index e88a8b38d..b4e71be2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,15 @@
-include go.mk/init.mk
-include go.mk/public.mk
-
 PACKAGE := github.com/exoscale/terraform-provider-exoscale
-
 PROJECT_URL = https://$(PACKAGE)
+GO_BUILD_EXTRA_ARGS = -v -trimpath
+EXTRA_ARGS := -parallel=3 -count=1 -failfast
 
-GO_LD_FLAGS := -ldflags "-s -w -X $(PACKAGE)/version.Version=${VERSION} \
-							-X $(PACKAGE)/version.Commit=${GIT_REVISION}"
+include go.mk/init.mk
 
+GO_LD_FLAGS := "-s -w -X $(PACKAGE)/version.Version=${VERSION} \
+							-X $(PACKAGE)/version.Commit=${GIT_REVISION}"
 GO_BIN_OUTPUT_NAME = terraform-provider-exoscale_v$(VERSION)
 
-GO_BUILD_EXTRA_ARGS = -v -trimpath
-
-EXTRA_ARGS := -parallel=3 -count=1 -failfast
+include go.mk/public.mk
 
 .PHONY: test-acc test-verbose test
 test: GO_TEST_EXTRA_ARGS=${EXTRA_ARGS}