diff --git a/mendel.list b/mendel.list.template
similarity index 80%
rename from mendel.list
rename to mendel.list.template
index 8688bcd..ec3662a 100644
--- a/mendel.list
+++ b/mendel.list.template
@@ -1,4 +1,4 @@
 deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-chef main
 deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-chef main
-deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-enterprise-chef main
-deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-enterprise-chef main
+deb [arch=armhf,arm64 trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-chef main
+deb-src [trusted=yes] https://packages.cloud.google.com/apt mendel-bsp-%BOARDNAME%-chef main
diff --git a/packages.mk b/packages.mk
index 14a6349..11ceaf0 100644
--- a/packages.mk
+++ b/packages.mk
@@ -139,9 +139,12 @@
 	$(ROOTDIR)/build/update_packages.sh
 	tar -C $(PRODUCT_OUT) --overwrite -czf $@ packages
 
-upstream-delta: $(ROOTDIR)/cache/update.tgz
+$(PRODUCT_OUT)/mendel.list: $(ROOTDIR)/build/mendel.list.template
+	sed -e "s;%BOARDNAME%;$(BOARD_NAME);g" $(ROOTDIR)/build/mendel.list.template > $(PRODUCT_OUT)/mendel.list
+
+upstream-delta: $(ROOTDIR)/cache/update.tgz $(PRODUCT_OUT)/mendel.list
 $(ROOTDIR)/cache/update.tgz:
-	$(ROOTDIR)/build/generate_update_tarball.py -rootdir=$(ROOTDIR) -sources_list=$(ROOTDIR)/build/mendel.list -package_dir=$(PRODUCT_OUT)/packages -output_tarball=$(ROOTDIR)/cache/update.tgz
+	$(ROOTDIR)/build/generate_update_tarball.py -rootdir=$(ROOTDIR) -sources_list=$(PRODUCT_OUT)/mendel.list -package_dir=$(PRODUCT_OUT)/packages -output_tarball=$(ROOTDIR)/cache/update.tgz
 
 packages:: $(ALL_PACKAGE_TARGETS)