diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
index f377967f..d2c03c35 100644
--- a/.github/workflows/presubmit.yaml
+++ b/.github/workflows/presubmit.yaml
@@ -129,7 +129,7 @@ jobs:
     - name: Install bazel
       run: |
         sudo apt-get update && sudo apt-get install -y apt-transport-https curl gnupg
-        curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg
+        curl -fsSL https://releases.bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg
         mv bazel-archive-keyring.gpg /usr/share/keyrings
         echo "deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
         sudo apt-get update && sudo apt-get install -y bazel zip unzip
diff --git a/pkg/cli/cvd.go b/pkg/cli/cvd.go
index 5116900e..0edb0927 100644
--- a/pkg/cli/cvd.go
+++ b/pkg/cli/cvd.go
@@ -507,7 +507,7 @@ func listCVDs(srvClient client.Client, controlDir string) ([]*RemoteHost, error)
 		hostName := hosts[i]
 		listResult := <-ch
 		if listResult.Error != nil {
-			merr = multierror.Append(merr, fmt.Errorf("lists cvds for host %q failed: %w", hostName, err))
+			merr = multierror.Append(merr, fmt.Errorf("lists cvds for host %q failed: %w", hostName, listResult.Error))
 			continue
 		}
 		srvURL, err := srvClient.HostServiceURL(hostName)