diff --git a/buildkite/install-bazel.sh b/buildkite/install-bazel.sh
index 561e87b..cbcc0bd 100755
--- a/buildkite/install-bazel.sh
+++ b/buildkite/install-bazel.sh
@@ -18,7 +18,7 @@
 PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)
 BAZEL_VERSION=$(curl -sSI https://github.com/bazelbuild/bazel/releases/latest | grep '^Location: ' | sed 's|.*/||' | sed $'s/\r//')
 
-curl -sSLo install.sh "https://releases.bazel.build/${BAZEL_VERSION}/release/bazel-${BAZEL_VERSION}-without-jdk-installer-${PLATFORM}.sh"
+curl -sSLo install.sh "https://releases.bazel.build/${BAZEL_VERSION}/release/bazel-${BAZEL_VERSION}-installer-${PLATFORM}.sh"
 bash install.sh > /dev/null
 bazel version
 
diff --git a/buildkite/setup-windows-manual.ps1 b/buildkite/setup-windows-manual.ps1
index 7a15498..df51cf2 100755
--- a/buildkite/setup-windows-manual.ps1
+++ b/buildkite/setup-windows-manual.ps1
@@ -184,7 +184,7 @@
 
 ## Download the latest Bazel.
 Write-Host "Downloading Bazel ${bazel_version}..."
-$bazel_url = "https://releases.bazel.build/${bazel_version}/release/bazel-${bazel_version}-without-jdk-windows-x86_64.exe"
+$bazel_url = "https://releases.bazel.build/${bazel_version}/release/bazel-${bazel_version}-windows-x86_64.exe"
 New-Item "c:\bazel" -ItemType "directory" -Force
 (New-Object Net.WebClient).DownloadFile($bazel_url, "c:\bazel\bazel.exe")
 $env:PATH = [Environment]::GetEnvironmentVariable("PATH", "Machine") + ";c:\bazel"
diff --git a/buildkite/setup-windows.ps1 b/buildkite/setup-windows.ps1
index 3a41e25..0090415 100755
--- a/buildkite/setup-windows.ps1
+++ b/buildkite/setup-windows.ps1
@@ -183,7 +183,7 @@
 
 ## Download the latest Bazel.
 Write-Host "Downloading Bazel ${bazel_version}..."
-$bazel_url = "https://releases.bazel.build/${bazel_version}/release/bazel-${bazel_version}-without-jdk-windows-x86_64.exe"
+$bazel_url = "https://releases.bazel.build/${bazel_version}/release/bazel-${bazel_version}-windows-x86_64.exe"
 New-Item "c:\bazel" -ItemType "directory" -Force
 (New-Object Net.WebClient).DownloadFile($bazel_url, "c:\bazel\bazel.exe")
 $env:PATH = [Environment]::GetEnvironmentVariable("PATH", "Machine") + ";c:\bazel"