diff --git a/Makefile b/Makefile
index ddbb3b4ae8..efd9d5fcf6 100644
--- a/Makefile
+++ b/Makefile
@@ -121,20 +121,6 @@ go-tidy:
 	$(MAKE) -C flytecopilot go-tidy
 
 .PHONY: lint
-lint-all:
-	$(MAKE) -C datacatalog lint
-	$(MAKE) -C flyteadmin lint
-	$(MAKE) -C flyteidl lint
-	$(MAKE) -C flytepropeller lint
-	$(MAKE) -C flyteplugins lint
-	$(MAKE) -C flytestdlib lint
-	$(MAKE) -C flytecopilot lint
-
-
-.PHONY: download_tooling
-download_tooling: #download dependencies (including test deps) for the package
-	@boilerplate/flyte/golang_test_targets/download_tooling.sh
-
-.PHONY: lint
-lint: download_tooling #lints the package for common code smells
+lint: #lints the package for common code smells
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
 	GL_DEBUG=linters_output,env find . -type f -name go.mod -maxdepth 3 -execdir golangci-lint run --deadline=5m --exclude deprecated -v \;
diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile
index 280e1e55e4..33b0937355 100644
--- a/boilerplate/flyte/golang_test_targets/Makefile
+++ b/boilerplate/flyte/golang_test_targets/Makefile
@@ -12,10 +12,6 @@ download_tooling: #download dependencies (including test deps) for the package
 generate: download_tooling #generate go code
 	@boilerplate/flyte/golang_test_targets/go-gen.sh
 
-.PHONY: lint
-lint: download_tooling #lints the package for common code smells
-	GL_DEBUG=linters_output,env golangci-lint run --deadline=5m --exclude deprecated -v
-
 # If code is failing goimports linter, this will fix.
 # skips 'vendor'
 .PHONY: goimports
@@ -50,7 +46,7 @@ test_unit_cover:
 test_unit_visual:
 	go test ./... -coverprofile /tmp/cover.out -covermode=count
 	go tool cover -html=/tmp/cover.out
-	
+
 .PHONY: test_unit_codecov
 test_unit_codecov:
 	go test ./... -race -coverprofile=coverage.txt -covermode=atomic