diff --git a/device/testing/device-lg-mako/APKBUILD b/device/testing/device-lg-mako/APKBUILD
index 8dc472fe9..43d825660 100644
--- a/device/testing/device-lg-mako/APKBUILD
+++ b/device/testing/device-lg-mako/APKBUILD
@@ -1,15 +1,20 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mako
-pkgver=2
-pkgrel=33
+pkgver=3
+pkgrel=0
 pkgdesc="Google Nexus 4"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-lg-mako mkbootimg"
+depends="
+	postmarketos-base
+	mkbootimg"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-weston"
-source="deviceinfo 90-android-touch-dev.rules profile.sh pointercal fb.modes weston.ini wcnss-wlan"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo 90-android-touch-dev.rules pointercal fb.modes wcnss-wlan"
 options="!check !archcheck"
 
 build() {
@@ -20,8 +25,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 "$srcdir"/90-android-touch-dev.rules \
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-	install -Dm644 "$srcdir"/profile.sh \
-		"$pkgdir"/etc/profile.d/00-$pkgname.sh
 	install -Dm644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 	install -Dm644 "$srcdir"/fb.modes \
@@ -35,18 +38,29 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-lg-mako wcnss-wlan"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Mainline kernel"
+	depends="linux-postmarketos-qcom-apq8064"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-lg-mako"
+	mkdir "$subpkgdir"
 }
 
 sha512sums="
-5f479cf07ed0c353cc7e41cfc5502ee6911b3816bcad24ba872d1232c0eaef3eced25722c2d1b9416c70fc6c1a786696172482911a90d58af39ca22263c1f208  deviceinfo
+a1ed8c7a7858d049e19e01cffce4af477ee046952cd7f8663ba17b766ed3bbb539ce5d8fee18d3eda6d87de870ba48c5e0e29ae3e444fb96c0b36a8c7c2ef8a8  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
 52b1465c75c51e2dc2e351a0609220af04b939b9edf7fca844cc00bb9eeb4e71f53e34817ba094e477fc43bf15101fcfd07963c791a36be5c52f199bba6a6d9d  pointercal
 217bdf692ade75d57968299e29e9379ffcfc97addf735663b3e1e7dfce049f9d13b26347b4405ac724ae5fac2946012dcc58014b23b8df357e225b6718dbc0a6  fb.modes
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
 a8cfde9dd3bc96d990038443e8d10a551f13536f017992ae23545d2f1e09b0f729e5cfd1f94f52a2a335335172f082925b91c980695a27f76f636343de795898  wcnss-wlan
 "
diff --git a/device/testing/device-lg-mako/deviceinfo b/device/testing/device-lg-mako/deviceinfo
index 6483e56fb..c25d0db07 100644
--- a/device/testing/device-lg-mako/deviceinfo
+++ b/device/testing/device-lg-mako/deviceinfo
@@ -16,11 +16,23 @@ deviceinfo_keyboard="false"
 deviceinfo_screen_width="768"
 deviceinfo_screen_height="1280"
 deviceinfo_dev_touchscreen="/dev/input/event2"
+deviceinfo_gpu_accelerated="false"
 
 # Fastboot related
 deviceinfo_generate_bootimg="true"
-deviceinfo_flash_offset_kernel="0x80208000"
-deviceinfo_flash_offset_ramdisk="0x81800000"
-deviceinfo_flash_offset_second="0x81100000"
-deviceinfo_flash_offset_tags="0x80200100"
+deviceinfo_kernel_cmdline_mainline="console=ttyMSM2,115200,n8 fw_devlink=permissive"
+deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_offset_base="0x80200000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+
+# Extra
+deviceinfo_getty_mainline="ttyMSM2;115200"
+deviceinfo_getty_downstream="ttyHSL0;115200"
diff --git a/device/testing/device-lg-mako/profile.sh b/device/testing/device-lg-mako/profile.sh
deleted file mode 100644
index d469a6b7f..000000000
--- a/device/testing/device-lg-mako/profile.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Run a few weston demos, because the postmarketos-demos program depends
-# on xwayland for now (Alpine's GTK3 isn't configured for Wayland
-# support yet.)
-if [ $(tty) = "/dev/tty1" ]; then
-	(
-		sleep 3;
-		export XDG_RUNTIME_DIR=/tmp/0-runtime-dir
-		weston-smoke &
-		weston-simple-damage &
-		weston-editor &
-		weston-terminal --shell=/usr/bin/htop &
-	) > /dev/null &
-fi
-
diff --git a/device/testing/device-lg-mako/weston.ini b/device/testing/device-lg-mako/weston.ini
deleted file mode 100644
index d94ea3a19..000000000
--- a/device/testing/device-lg-mako/weston.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=false
-backend=fbdev-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg