diff --git a/multistrap.mk b/multistrap.mk
index 42182bb..973ce9d 100644
--- a/multistrap.mk
+++ b/multistrap.mk
@@ -17,7 +17,6 @@
 endif
 
 include $(ROOTDIR)/build/preamble.mk
-include $(ROOTDIR)/build/rootfs-packages.mk
 
 MULTISTRAP_WORK_DIR := $(PRODUCT_OUT)/multistrap/work
 
@@ -36,7 +35,7 @@
 
 	cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)/multistrap
 	sed -i -e 's/USERSPACE_ARCH/$(USERSPACE_ARCH)/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
-	sed -i -e 's/MAIN_PACKAGES/$(PACKAGES_EXTRA) $(BASE_PACKAGES) $(BSP_BASE_PACKAGES)/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
+	sed -i -e 's/MAIN_PACKAGES/$(PACKAGES_EXTRA) $(BOARD_NAME)-core/g' $(PRODUCT_OUT)/multistrap/multistrap.conf
 	sudo multistrap -f $(PRODUCT_OUT)/multistrap/multistrap.conf -d $(MULTISTRAP_WORK_DIR)
 
 	sudo mount -o bind /dev $(MULTISTRAP_WORK_DIR)/dev
diff --git a/packages.mk b/packages.mk
index 79d0025..f13b768 100644
--- a/packages.mk
+++ b/packages.mk
@@ -129,6 +129,7 @@
 $(eval $(call make-pbuilder-package-target,runonce,packages/runonce))
 $(eval $(call make-pbuilder-package-target,usb-gadget,packages/usb-gadget))
 $(eval $(call make-pbuilder-package-target,vitalsd,packages/vitalsd))
+$(eval $(call make-pbuilder-package-target,meta-mendel,packages/meta-mendel))
 
 include $(ROOTDIR)/board/packages.mk
 
diff --git a/preamble.mk b/preamble.mk
index 9d943e0..77ca1c5 100644
--- a/preamble.mk
+++ b/preamble.mk
@@ -22,7 +22,10 @@
   IS_EXTERNAL ?= true
 endif
 endif
+
 -include $(ROOTDIR)/board/arch.mk
+BOARD_NAME ?= mendel
+
 ifeq ($(IS_EXTERNAL),)
   PREBUILT_DOCKER_ROOT ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker/
   FETCH_PBUILDER_DIRECTORY ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/pbuilder/
diff --git a/rootfs-packages.mk b/rootfs-packages.mk
deleted file mode 100644
index c6813df..0000000
--- a/rootfs-packages.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
-BASE_PACKAGES := \
-    base-files \
-    mdt-services \
-    mendel-distro-info-data \
-    mendel-keyring \
-    mendel-minimal \
-    runonce \
-    usb-gadget \
-    vitalsd
-
-GUI_PACKAGES := \
-    gstreamer1.0-alsa \
-    gstreamer1.0-plugins-bad \
-    gstreamer1.0-plugins-base \
-    gstreamer1.0-plugins-base-apps \
-    gstreamer1.0-plugins-good \
-    gstreamer1.0-plugins-ugly \
-    gstreamer1.0-tools \
-    libdrm2 \
-    libgstreamer1.0-0 \
-    libgstreamer-plugins-bad1.0-0 \
-    libgstreamer-plugins-base1.0-0
diff --git a/rootfs.mk b/rootfs.mk
index 560fa58..8af3899 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -24,17 +24,14 @@
 ROOTFS_PATCHED_IMG := $(PRODUCT_OUT)/obj/ROOTFS/rootfs_$(USERSPACE_ARCH).patched.img
 ROOTFS_RAW_LOCAL_CACHE_PATH := $(ROOTDIR)/cache/rootfs_$(USERSPACE).raw.img
 
-include $(ROOTDIR)/build/rootfs-packages.mk
-include $(ROOTDIR)/board/rootfs.mk
-
 ifeq ($(HEADLESS_BUILD),)
     $(info )
     $(info *** GUI build selected -- set HEADLESS_BUILD=true if this is not what you intend.)
-	PRE_INSTALL_PACKAGES := $(BASE_PACKAGES) $(BSP_BASE_PACKAGES) $(GUI_PACKAGES) $(BSP_GUI_PACKAGES)
+	PRE_INSTALL_PACKAGES := $(BOARD_NAME)-core $(BOARD_NAME)-gui
 else
     $(info )
     $(info *** Headless build selected -- unset HEADLESS_BUILD if this is not what you intend.)
-	PRE_INSTALL_PACKAGES := $(BASE_PACKAGES) $(BSP_BASE_PACKAGES)
+	PRE_INSTALL_PACKAGES := $(BOARD_NAME)-core
 endif
 
 ifeq ($(FETCH_PACKAGES),true)