diff --git a/Makefile b/Makefile
index 140f8188076..eb7756e750b 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,7 @@ update-workspace:
 	bash scripts/go-workspace/update-workspace.sh
 
 .PHONY: build-go
-build-go: update-workspace gen-go ## Build all Go binaries.
+build-go: gen-go update-workspace ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
diff --git a/scripts/go-workspace/update-workspace.sh b/scripts/go-workspace/update-workspace.sh
index 6818ef4e41f..d233b815c4c 100755
--- a/scripts/go-workspace/update-workspace.sh
+++ b/scripts/go-workspace/update-workspace.sh
@@ -9,7 +9,7 @@ REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
 for mod in $(go run scripts/go-workspace/main.go list-submodules --path "${REPO_ROOT}/go.work"); do
     pushd "${mod}"
     echo "Running go mod tidy in ${mod}"
-    go mod tidy 
+    go mod tidy || true
     popd
 done