diff --git a/BUILD b/BUILD
index bdcb638..4806f47 100644
--- a/BUILD
+++ b/BUILD
@@ -4,3 +4,9 @@
 # gazelle:exclude core/generated
 # gazelle:exclude imports.go
 gazelle(name = "gazelle")
+
+# Shortcut for the Go SDK
+alias(
+    name = "go",
+    actual = "@go_sdk//:bin/go",
+)
diff --git a/scripts/gazelle.sh b/scripts/gazelle.sh
index 12c60bc..d6e7cee 100755
--- a/scripts/gazelle.sh
+++ b/scripts/gazelle.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 # gazelle.sh regenerates BUILD.bazel files for Go source files.
+set -euo pipefail
 
+bazel run //:go mod tidy
 bazel run //:gazelle -- update
 bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories -prune=true