diff --git a/buildkite/install-buildkite-agent.sh b/buildkite/install-buildkite-agent.sh
index 38f839a..1f73383 100755
--- a/buildkite/install-buildkite-agent.sh
+++ b/buildkite/install-buildkite-agent.sh
@@ -22,7 +22,7 @@
   *ubuntu*)
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 \
         --recv-keys 32A37959C2FA5C3C99EFBC32A79206696452D198 &> /dev/null
-    add-apt-repository -y "deb https://apt.buildkite.com/buildkite-agent unstable main"
+    add-apt-repository -y "deb https://apt.buildkite.com/buildkite-agent stable main"
     apt-get -qqy update > /dev/null
     apt-get -qqy install buildkite-agent > /dev/null
     ;;
diff --git a/buildkite/setup-windows-manual.ps1 b/buildkite/setup-windows-manual.ps1
index 0a1a94f..7a15498 100755
--- a/buildkite/setup-windows-manual.ps1
+++ b/buildkite/setup-windows-manual.ps1
@@ -233,8 +233,14 @@
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "extras;android;m2repository"
 
 ## Download and install the Buildkite agent.
+Write-Host "Grabbing latest Buildkite Agent version number from GitHub..."
+$url = "https://github.com/buildkite/agent/releases/latest"
+$req = [system.Net.HttpWebRequest]::Create($url)
+$res = $req.getresponse()
+$res.Close()
+$buildkite_agent_version = $res.ResponseUri.AbsolutePath.TrimStart("/buildkite/agent/releases/tag/v")
+
 Write-Host "Downloading Buildkite agent..."
-$buildkite_agent_version = "3.0-beta.42"
 $buildkite_agent_url = "https://github.com/buildkite/agent/releases/download/v${buildkite_agent_version}/buildkite-agent-windows-amd64-${buildkite_agent_version}.zip"
 $buildkite_agent_zip = "c:\temp\buildkite-agent.zip"
 $buildkite_agent_root = "c:\buildkite"
diff --git a/buildkite/setup-windows.ps1 b/buildkite/setup-windows.ps1
index fbe5f4b..3a41e25 100755
--- a/buildkite/setup-windows.ps1
+++ b/buildkite/setup-windows.ps1
@@ -232,8 +232,14 @@
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "extras;android;m2repository"
 
 ## Download and install the Buildkite agent.
+Write-Host "Grabbing latest Buildkite Agent version number from GitHub..."
+$url = "https://github.com/buildkite/agent/releases/latest"
+$req = [system.Net.HttpWebRequest]::Create($url)
+$res = $req.getresponse()
+$res.Close()
+$buildkite_agent_version = $res.ResponseUri.AbsolutePath.TrimStart("/buildkite/agent/releases/tag/v")
+
 Write-Host "Downloading Buildkite agent..."
-$buildkite_agent_version = "3.0-beta.42"
 $buildkite_agent_url = "https://github.com/buildkite/agent/releases/download/v${buildkite_agent_version}/buildkite-agent-windows-amd64-${buildkite_agent_version}.zip"
 $buildkite_agent_zip = "c:\temp\buildkite-agent.zip"
 $buildkite_agent_root = "c:\buildkite"