diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index 000bc00aa5..f6f6db2d70 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -15,7 +15,6 @@ TOOLCHAIN_PKGS=(
 # compiler to build a full native toolchain. Packages are not uploaded.
 declare -A CROSS_PROFILES
 CROSS_PROFILES["x86_64-cros-linux-gnu"]="coreos:coreos/amd64/generic"
-CROSS_PROFILES["aarch64-cros-linux-gnu"]="coreos:coreos/arm64/generic"
 
 # Map board names to CHOSTs and portage profiles. This is the
 # definitive list, there is assorted code new and old that either
@@ -24,9 +23,6 @@ declare -A BOARD_CHOSTS BOARD_PROFILES
 BOARD_CHOSTS["amd64-usr"]="x86_64-cros-linux-gnu"
 BOARD_PROFILES["amd64-usr"]="coreos:coreos/amd64/generic"
 
-BOARD_CHOSTS["arm64-usr"]="aarch64-cros-linux-gnu"
-BOARD_PROFILES["arm64-usr"]="coreos:coreos/arm64/generic"
-
 BOARD_NAMES=( "${!BOARD_CHOSTS[@]}" )
 
 # Declare the above globals as read-only to avoid accidental conflicts.
@@ -43,7 +39,6 @@ declare -r \
 # Usage: get_portage_arch chost
 get_portage_arch() {
     case "$1" in
-        aarch64*)   echo arm64;;
         alpha*)     echo alpha;;
         arm*)       echo arm;;
         hppa*)      echo hppa;;
diff --git a/common.sh b/common.sh
index 5fd92cc2f8..20ad5d45bd 100644
--- a/common.sh
+++ b/common.sh
@@ -328,7 +328,7 @@ readonly COREOS_EPOCH=1372636800
 TODAYS_VERSION=$(( (`date +%s` - ${COREOS_EPOCH}) / 86400 ))
 
 # Download URL prefix for SDK and board binary packages
-: ${FLATCAR_DEV_BUILDS:=https://test.release.flatcar-linux.net}
+: ${FLATCAR_DEV_BUILDS:=https://storage.googleapis.com/jenkins-flatcar}
 
 # Load developer's custom settings.  Default location is in scripts dir,
 # since that's available both inside and outside the chroot.  By convention,
diff --git a/jenkins/vm.sh b/jenkins/vm.sh
index 8a8ae7fbcb..aab63e7949 100644
--- a/jenkins/vm.sh
+++ b/jenkins/vm.sh
@@ -38,7 +38,7 @@ bin/cork download-image \
     --platform=qemu \
     --verify=true $verify_key
 
-img=src/coreos_production_image.bin
+img=src/flatcar_production_image.bin
 [[ "${img}.bz2" -nt "${img}" ]] &&
 enter lbunzip2 -k -f "/mnt/host/source/${img}.bz2"