diff --git a/jenkins/images.sh b/jenkins/images.sh
index a2b41eb05c..dea4784f66 100644
--- a/jenkins/images.sh
+++ b/jenkins/images.sh
@@ -12,7 +12,6 @@ enter() {
         sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json
         bin/cork enter --experimental -- env \
             COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -23,8 +22,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID
 
@@ -43,12 +40,10 @@ else
         script set_official --board="${BOARD}" --noofficial
 fi
 
-# Try to find the version's torcx store, but don't require it.
-torcx_store=
+# Retrieve this version's torcx vendor store.
 enter gsutil cp -r \
     "${DOWNLOAD_ROOT}/boards/${BOARD}/${COREOS_VERSION}/torcx" \
-    /mnt/host/source/ &&
-torcx_store=/mnt/host/source/torcx &&
+    /mnt/host/source/
 for image in torcx/*.torcx.tgz
 do
         gpg --verify "${image}.sig"
@@ -73,6 +68,6 @@ script build_image \
     --getbinpkgver="${COREOS_VERSION}" \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
-    ${torcx_store:+--torcx_store="${torcx_store}"} \
+    --torcx_store=/mnt/host/source/torcx \
     --upload_root="${UPLOAD_ROOT}" \
     --upload prod container
diff --git a/jenkins/packages.sh b/jenkins/packages.sh
index 9702ce045c..6c57a8435c 100644
--- a/jenkins/packages.sh
+++ b/jenkins/packages.sh
@@ -16,7 +16,6 @@ enter() {
             CCACHE_DIR=/mnt/host/source/.cache/ccache \
             CCACHE_MAXSIZE=5G \
             COREOS_DEV_BUILDS="${DOWNLOAD_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -27,8 +26,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID
 
@@ -48,14 +45,12 @@ script build_packages \
     --board="${BOARD}" \
     --getbinpkgver=${RELEASE_BASE:-"${COREOS_VERSION}" --toolchainpkgonly} \
     --skip_chroot_upgrade \
-    $([ -x src/scripts/build_torcx_store ] && echo --skip_torcx_store) \
+    --skip_torcx_store \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
     --upload_root="${UPLOAD_ROOT}" \
     --upload
 
-# Build and upload torcx images if this version supports it.
-[ -x src/scripts/build_torcx_store ] &&
 script build_torcx_store \
     --board="${BOARD}" \
     --sign="${SIGNING_USER}" \
diff --git a/jenkins/vm.sh b/jenkins/vm.sh
index a4c79a5308..88b3d8873f 100644
--- a/jenkins/vm.sh
+++ b/jenkins/vm.sh
@@ -12,7 +12,6 @@ enter() {
         sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json
         bin/cork enter --experimental -- env \
             COREOS_DEV_BUILDS="${GS_DEVEL_ROOT}" \
-            PORTAGE_SSH_OPTS= \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
 --json-key=/etc/portage/gangue.json $verify_key \
 "'"${URI}" "${DISTDIR}/${FILE}"' \
@@ -23,8 +22,6 @@ script() {
         enter "/mnt/host/source/src/scripts/$@"
 }
 
-sudo cp bin/gangue chroot/usr/bin/gangue  # XXX: until SDK mantle has it
-
 source .repo/manifests/version.txt
 export COREOS_BUILD_ID