diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index 0035ced815f..f699a295267 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -476,15 +476,10 @@ kube::util::go_install_from_commit() {
 
   kube::util::ensure-temp-dir
   mkdir -p "${KUBE_TEMP}/go/src"
-  # TODO(spiffxp): remove this brittle workaround for go getting a package that doesn't exist at HEAD
-  repo=$(echo ${pkg} | cut -d/ -f1-3)
-  git clone "https://${repo}" "${KUBE_TEMP}/go/src/${repo}"
-  # GOPATH="${KUBE_TEMP}/go" go get -d -u "${pkg}"
+  GOPATH="${KUBE_TEMP}/go" go get -d -u "${pkg}"
   (
-    cd "${KUBE_TEMP}/go/src/${repo}"
-    git fetch # TODO(spiffxp): workaround
+    cd "${KUBE_TEMP}/go/src/${pkg}"
     git checkout -q "${commit}"
-    GOPATH="${KUBE_TEMP}/go" go get -d "${pkg}" #TODO(spiffxp): workaround
     GOPATH="${KUBE_TEMP}/go" go install "${pkg}"
   )
   PATH="${KUBE_TEMP}/go/bin:${PATH}"
diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh
index e569d94e9c7..1690c32f8f5 100755
--- a/hack/update-bazel.sh
+++ b/hack/update-bazel.sh
@@ -31,8 +31,8 @@ kube::util::go_install_from_commit \
     github.com/kubernetes/repo-infra/kazel \
     ae4e9a3906ace4ba657b7a09242610c6266e832c
 kube::util::go_install_from_commit \
-    github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle \
-    737df20c53499fd84b67f04c6ca9ccdee2e77089
+    github.com/bazelbuild/bazel-gazelle/cmd/gazelle \
+    31ce76e3acc34a22434d1a783bb9b3cae790d108  # 0.8.0
 
 touch "${KUBE_ROOT}/vendor/BUILD"