diff --git a/packages.mk b/packages.mk
index 5614604..f22fc5b 100644
--- a/packages.mk
+++ b/packages.mk
@@ -119,12 +119,12 @@
 endef
 
 $(eval $(call make-pbuilder-package-target,aiy-board-gadget,packages/aiy-board-gadget))
-$(eval $(call make-pbuilder-package-target,aiy-board-keyring,packages/aiy-board-keyring))
 $(eval $(call make-pbuilder-package-target,aiy-board-tweaks,packages/aiy-board-tweaks))
 $(eval $(call make-pbuilder-package-target,base-files,packages/base-files))
 $(eval $(call make-pbuilder-package-target,edgetpu-api,packages/edgetpu-api,,,binary))
 $(eval $(call make-pbuilder-package-target,mdt-services,packages/mdt-services))
 $(eval $(call make-pbuilder-package-target,mendel-distro-info-data,packages/mendel-distro-info-data))
+$(eval $(call make-pbuilder-package-target,mendel-keyring,packages/mendel-keyring))
 $(eval $(call make-pbuilder-package-target,runonce,packages/runonce))
 
 include $(ROOTDIR)/board/packages.mk
diff --git a/rootfs.mk b/rootfs.mk
index 2fe71a9..f46be03 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -26,7 +26,6 @@
 
 BASE_PACKAGES := \
 	aiy-board-gadget \
-	aiy-board-keyring \
 	aiy-board-tweaks \
 	base-files \
 	bluetooth \
@@ -34,6 +33,7 @@
 	libbluetooth3 \
 	mdt-services \
 	mendel-distro-info-data \
+	mendel-keyring \
 	runonce
 
 GUI_PACKAGES := \
@@ -164,7 +164,7 @@
 	echo 'deb-src https://deb.debian.org/debian-security/ stretch/updates main' |sudo tee -a $(ROOTFS_DIR)/etc/apt/sources.list.d/security.list
 	sudo cp $(ROOTDIR)/build/99network-settings $(ROOTFS_DIR)/etc/apt/apt.conf.d/
 	sudo chroot $(ROOTFS_DIR) bash -c 'apt-get update'
-	sudo chroot $(ROOTFS_DIR) bash -c 'apt-get install -y --allow-unauthenticated aiy-board-keyring'
+	sudo chroot $(ROOTFS_DIR) bash -c 'apt-get install -y --allow-unauthenticated mendel-keyring'
 	sudo chroot $(ROOTFS_DIR) bash -c 'apt-get update'
 	$(LOG) rootfs patch keyring finished