diff --git a/mendel.list.template b/mendel.list.template
index 21ad31f..1a6792e 100644
--- a/mendel.list.template
+++ b/mendel.list.template
@@ -1,4 +1,2 @@
 deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-day main
 deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-day main
-deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-day main
-deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-day main
diff --git a/packages.mk b/packages.mk
index 0c84968..d8d9b28 100644
--- a/packages.mk
+++ b/packages.mk
@@ -28,7 +28,7 @@
 	mkdir -p $(ROOTDIR)/cache
 	sudo pbuilder create \
 		--basetgz $@ \
-		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main|deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$(BOARD_NAME)-day main" \
+		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
 		--distribution buster \
 		--architecture amd64 \
 		--extrapackages "crossbuild-essential-armhf crossbuild-essential-arm64 debhelper gnupg lintian qemu-user-static" \
@@ -43,7 +43,7 @@
 	mkdir -p $(ROOTDIR)/cache
 	sudo pbuilder create \
 		--basetgz $@ \
-		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main|deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$(BOARD_NAME)-day main" \
+		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
 		--distribution buster \
 		--architecture arm64 \
 		--extrapackages "build-essential debhelper gnupg lintian" \
diff --git a/pbuilderrc b/pbuilderrc
index 7f694e3..7b6b5ef 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -4,7 +4,7 @@
 # the default template
 #
 # read pbuilderrc.5 document for notes on specific options.
-OTHERMIRROR="deb https://packages.cloud.google.com/apt mendel-day main|deb https://packages.cloud.google.com/apt mendel-bsp-$BOARD_NAME-day main"
+OTHERMIRROR="deb https://packages.cloud.google.com/apt mendel-day main"
 PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-apt
 export DEPSBASE=$PRODUCT_OUT/packages
 BINDMOUNTS="$DEPSBASE $ROOTDIR"
diff --git a/preamble.mk b/preamble.mk
index a52608e..e50c757 100644
--- a/preamble.mk
+++ b/preamble.mk
@@ -27,7 +27,7 @@
 BOARD_NAME ?= mendel
 
 ifeq ($(IS_EXTERNAL),)
-  CACHED_BUILD_IMAGE_DIRECTORY ?= /google/data/ro/teams/spacepark/mendel/kokoro/prod
+  CACHED_BUILD_IMAGE_DIRECTORY ?= /google/data/ro/teams/spacepark/columbia/kokoro/prod
   PREBUILT_DOCKER_ROOT ?= $(CACHED_BUILD_IMAGE_DIRECTORY)/docker/
   FETCH_PBUILDER_DIRECTORY ?= $(CACHED_BUILD_IMAGE_DIRECTORY)/pbuilder/
 endif