diff --git a/.circleci/config.yml b/.circleci/config.yml
index a8e718b109..1fc23c59e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,6 +82,7 @@ jobs:
           name: Get metalinter
           command: |
             export PATH="$GOBIN:$PATH"
+            make devtools-clean
             make devtools
       - run:
           name: Lint source
diff --git a/Makefile b/Makefile
index 83da9aecb9..10d347069b 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ update_dev_tools:
 	go get -u github.com/tendermint/lint/golint
 
 devtools: devtools-stamp
+devtools-clean: tools-clean
 devtools-stamp: tools
 	@echo "--> Downloading linters (this may take awhile)"
 	$(GOPATH)/src/github.com/alecthomas/gometalinter/scripts/install.sh -b $(GOBIN)
@@ -273,4 +274,4 @@ build-linux build-docker-gaiadnode localnet-start localnet-stop \
 format check-ledger test_sim_gaia_nondeterminism test_sim_modules test_sim_gaia_fast \
 test_sim_gaia_custom_genesis_fast test_sim_gaia_custom_genesis_multi_seed \
 test_sim_gaia_multi_seed test_sim_gaia_import_export update_tools update_dev_tools \
-build-snap-edge
+build-snap-edge devtools-clean
diff --git a/scripts/Makefile b/scripts/Makefile
index 910c6f68db..4a0a7d157b 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -45,7 +45,7 @@ $(GOPATH)/bin/dep:
 
 #v2.0.11
 $(GOPATH)/bin/gometalinter:
-	$(call go_install,alecthomas,gometalinter,17a7ffa42374937bfecabfb8d2efbd4db0c26741)
+	$(call go_install,alecthomas,gometalinter,v3.0.0)
 
 $(GOPATH)/bin/statik:
 	$(call go_install,rakyll,statik,v0.1.5)
@@ -53,4 +53,7 @@ $(GOPATH)/bin/statik:
 $(GOPATH)/bin/goimports:
 	go get golang.org/x/tools/cmd/goimports
 
-.PHONY: all
+tools-clean:
+	cd $(GOPATH)/bin && rm -f dep gometalinter statik goimports
+
+.PHONY: all clean-tools