diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile
index 280e1e55e4..e47cfba503 100644
--- a/boilerplate/flyte/golang_test_targets/Makefile
+++ b/boilerplate/flyte/golang_test_targets/Makefile
@@ -6,7 +6,7 @@
 
 .PHONY: download_tooling
 download_tooling: #download dependencies (including test deps) for the package
-	@boilerplate/flyte/golang_test_targets/download_tooling.sh
+	../boilerplate/flyte/golang_test_targets/download_tooling.sh
 
 .PHONY: generate
 generate: download_tooling #generate go code
diff --git a/boilerplate/flyte/golang_test_targets/download_tooling.sh b/boilerplate/flyte/golang_test_targets/download_tooling.sh
index 003220ea70..b5e6f6688a 100755
--- a/boilerplate/flyte/golang_test_targets/download_tooling.sh
+++ b/boilerplate/flyte/golang_test_targets/download_tooling.sh
@@ -16,22 +16,22 @@ set -e
 # List of tools to go get
 # In the format of "<cli>:<package>" or ":<package>" if no cli
 tools=(
-  "github.com/EngHabu/mockery/cmd/mockery"
-  "github.com/flyteorg/flytestdlib/cli/pflags@latest"
-  "github.com/golangci/golangci-lint/cmd/golangci-lint@latest"
-  "github.com/alvaroloes/enumer"
-  "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
+	"github.com/EngHabu/mockery/cmd/mockery"
+	"github.com/flyteorg/flytestdlib/cli/pflags@latest"
+	# Pin to this version while investigating failure
+	"github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2"
+	"github.com/alvaroloes/enumer"
+	"github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
 )
 
 tmp_dir=$(mktemp -d -t gotooling-XXX)
 echo "Using temp directory ${tmp_dir}"
-cp -R boilerplate/flyte/golang_support_tools/* $tmp_dir
+cp -R ../boilerplate/flyte/golang_support_tools/* $tmp_dir
 pushd "$tmp_dir"
 
-for tool in "${tools[@]}"
-do
-    echo "Installing ${tool}"
-    GO111MODULE=on go install $tool
+for tool in "${tools[@]}"; do
+	echo "Installing ${tool}"
+	GO111MODULE=on go install $tool
 done
 
 popd
diff --git a/datacatalog/Makefile b/datacatalog/Makefile
index 9ce7f7fd6a..f730fa99ae 100644
--- a/datacatalog/Makefile
+++ b/datacatalog/Makefile
@@ -1,6 +1,6 @@
 export REPOSITORY=datacatalog
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:
diff --git a/flyteadmin/Makefile b/flyteadmin/Makefile
index df3dcd3797..ab30dde558 100644
--- a/flyteadmin/Makefile
+++ b/flyteadmin/Makefile
@@ -1,8 +1,8 @@
 export REPOSITORY=flyteadmin
 export FLYTE_SCHEDULER_REPOSITORY=flytescheduler
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
-include boilerplate/flyte/end2end/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/end2end/Makefile
 
 GIT_VERSION := $(shell git describe --always --tags)
 GIT_HASH := $(shell git rev-parse --short HEAD)
diff --git a/flyteplugins/Makefile b/flyteplugins/Makefile
index 0bea656467..fb95f5ee9e 100755
--- a/flyteplugins/Makefile
+++ b/flyteplugins/Makefile
@@ -1,6 +1,6 @@
 export REPOSITORY=flyteplugins
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:
diff --git a/flytepropeller/Makefile b/flytepropeller/Makefile
index be00efaaf6..b00d920cf8 100644
--- a/flytepropeller/Makefile
+++ b/flytepropeller/Makefile
@@ -1,7 +1,7 @@
 export REPOSITORY=flytepropeller
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
-include boilerplate/flyte/end2end/Makefile
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/end2end/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate:
diff --git a/flytestdlib/Makefile b/flytestdlib/Makefile
index 0b5dae5a70..0ec1d8e53d 100644
--- a/flytestdlib/Makefile
+++ b/flytestdlib/Makefile
@@ -1,5 +1,5 @@
 export REPOSITORY=flytestdlib
-include boilerplate/flyte/golang_test_targets/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: update_boilerplate
 update_boilerplate: