diff --git a/.bazelversion b/.bazelversion
index 1545d9665..8a30e8f94 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.5.0
+5.4.0
diff --git a/tools/gcloud/repository_rules.bzl b/tools/gcloud/repository_rules.bzl
index 7ca0c1ccf..3ca3a4e5e 100644
--- a/tools/gcloud/repository_rules.bzl
+++ b/tools/gcloud/repository_rules.bzl
@@ -11,6 +11,6 @@ def _gcloud_sdk_impl(ctx):
 gcloud_sdk = repository_rule(
     implementation = _gcloud_sdk_impl,
     attrs = {
-        "version": attr.string(default = "318.0.0"),
+        "version": attr.string(default = "412.0.0"),
     },
 )
diff --git a/vscode/server.ts b/vscode/server.ts
index 3a7d9840d..1ac15a94e 100644
--- a/vscode/server.ts
+++ b/vscode/server.ts
@@ -85,7 +85,7 @@ function gatherAllActions(
 
 function retrieveLinkedFileName(ref: string) {
   const allActions = gatherAllActions();
-  const foundCompileAction = allActions.find(action => action.name.split(".").slice(-1)[0] === ref);
+  const foundCompileAction = allActions.find(action => action.target.name === ref);
   return foundCompileAction.fileName;
 }