diff --git a/pkg/boot-rpi3/build b/pkg/boot-rpi3/build
index 5d48577..6685507 100755
--- a/pkg/boot-rpi3/build
+++ b/pkg/boot-rpi3/build
@@ -16,7 +16,6 @@ deploy() {
 	rm $DEPLOY/kernel7.img
 	rm $DEPLOY/kernel.img
 	rm $DEPLOY/COPYING.linux
-	rm $DEPLOY/*.dtb
 
 	cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$DEPLOY/config.txt"
 }
diff --git a/pkg/boot-rpi3/config.txt b/pkg/boot-rpi3/config.txt
index 77895e2..ffd38e7 100644
--- a/pkg/boot-rpi3/config.txt
+++ b/pkg/boot-rpi3/config.txt
@@ -56,3 +56,5 @@
 dtparam=audio=on
 
 enable_uart=1
+
+kernel=KERNELFILE
diff --git a/pkg/linux-rpi3/build b/pkg/linux-rpi3/build
index 5c17e59..e75b998 100755
--- a/pkg/linux-rpi3/build
+++ b/pkg/linux-rpi3/build
@@ -35,10 +35,7 @@ deploy() {
 	local BUILD="$2"
 	local DEPLOY="$3"
 
-	local CFGFILE="$SCRIPTDIR/board/$BOARD/linux.config"
-
 	pushd $BUILD
-	install -m 755 "arch/arm/boot/zImage" "$DEPLOY/kernel.img"
-	cp arch/arm/boot/dts/*.dtb "$DEPLOY/"
+	install -m 755 "arch/arm/boot/zImage" "$DEPLOY/vmlinuz"
 	popd
 }
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index fc36002..f53261c 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -20,9 +20,15 @@ build() {
 	cp "$SCRIPTDIR/$PKGDIR/$PKGNAME/genimage.sh" "$BUILD"
 
 	# substitute file names in scripts
-	local rootfs_image="rootfs.img"
+	mkdir -p "$BUILD/boot/$OS_RELEASE"
+	mv "$BUILD/boot/rootfs.img" "$BUILD/boot/$OS_RELEASE"
+	mv "$BUILD/boot/vmlinuz" "$BUILD/boot/$OS_RELEASE"
 
-	sed -i 's/ROOTFSFILE/'$rootfs_image'/g' "$BUILD/boot/cmdline.txt"
+	local rootfs_image="$OS_RELEASE/rootfs.img"
+	local kernel_image="$OS_RELEASE/vmlinuz"
+
+	sed -i 's#ROOTFSFILE#'$rootfs_image'#g' "$BUILD/boot/cmdline.txt"
+	sed -i 's#KERNELFILE#'$kernel_image'#g' "$BUILD/boot/config.txt"
 }
 
 deploy() {