diff --git a/Makefile b/Makefile
index 52eaeeddb..db76bbb00 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,10 @@ DEV_MAILHOG_SMTP_ADDR ?= 1025
 DEV_MAILHOG_HTTP_ADDR ?= 8025
 
 GIN_ARG_LADDR ?= localhost
-GIN_ARGS      ?= --laddr $(GIN_ARG_LADDR) --immediate
+GIN_ARGS      ?= --laddr $(GIN_ARG_LADDR) --build cmd/corteza --immediate
 
+GIN_CORTEZA_ENV_FILE ?= .env
+GIN_CORTEZA_BIN_ARGS ?= --env-file $(GIN_CORTEZA_ENV_FILE)
 
 DOCKER                ?= docker
 
@@ -107,7 +109,7 @@ $(RELEASE_PKEY):
 # Development
 
 watch: $(GIN)
-	$(GIN) $(GIN_ARGS) --build cmd/corteza run -- serve
+	$(GIN) $(GIN_ARGS) -- $(GIN_CORTEZA_BIN_ARGS) serve
 
 realize: watch # BC
 
diff --git a/Makefile.inc b/Makefile.inc
index 1489de333..ce27e6453 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,5 +1,5 @@
 GO         = go
-GOGET      = $(GO) get -u
+GOINSTALL  = $(GO) install
 GOFLAGS   ?= -trimpath
 GOPATH    ?= $(HOME)/go
 
@@ -30,28 +30,28 @@ BINS = $(GOCRITIC) $(MOCKGEN) $(GOTEST) $(STATICCHECK) $(PROTOGEN) $(GIN) $(STAT
 ########################################################################################################################
 # Go Toolset
 $(GOCRITIC):
-	$(GOGET) github.com/go-critic/go-critic/...
+	$(GOINSTALL) github.com/go-critic/go-critic@latest
 
 $(MOCKGEN):
-	$(GOGET) github.com/golang/mock/mockgen
+	$(GOINSTALL) github.com/golang/mock/mockgen@latest
 
 $(STATICCHECK):
-	$(GOGET) honnef.co/go/tools/cmd/staticcheck
+	$(GOINSTALL) honnef.co/go/tools/cmd/staticcheck@latest
 
 $(PROTOGEN):
-	$(GOGET) github.com/golang/protobuf/protoc-gen-go
+	$(GOINSTALL) github.com/golang/protobuf/protoc-gen-go@latest
 
 $(PROTOGEN_GRPC):
-	$(GOGET) google.golang.org/grpc/cmd/protoc-gen-go-grpc
+	$(GOINSTALL) google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 
 $(GIN):
-	$(GOGET) github.com/codegangsta/gin
+	$(GOINSTALL) github.com/codegangsta/gin@latest
 
 $(GOTEST):
-	$(GOGET) github.com/rakyll/gotest
+	$(GOINSTALL) github.com/rakyll/gotest@latest
 
 $(STATIK):
-	$(GOGET) github.com/goware/statik
+	$(GOINSTALL) github.com/goware/statik@latest
 
 $(CODEGEN):
 	$(GO) build -o $@ cmd/codegen/main.go