diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index af5faa17d..4c266fb30 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,6 +1,6 @@
 maintainer=""
 pkgname=devicepkg-dev
-pkgver=0.21.0
+pkgver=0.22.0
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -78,8 +78,8 @@ d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214a
 72bb56338a2945670594300052fe688b9fa9277fd6cd9857e60f90de4f64b772190535e1579616d8a32e7bbbffde06923ffd89f6c6c63c7de4b4259b52b5a350  devicepkg_package.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
-b9e64582d8c4ed35116002388b58ee62531b8db5de3f4629980ca5dcc9f39ba2c1c7c7a9caa03438e183afa42c8cc6680fe217304ef667b8bf213d93789226e9  devicepkg_subpackage_kernel.sh
-f09cb34626f2aedf9ffa69a8050500d54291c416f5e8c8d67ce72244e1d906b190d84a3fadccd7d82824b6a68d981ca8a197a053804df1103457ddb7892b2cc9  deviceinfo
-136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1  expected-deviceinfo-downstream
-b2e87ab10c116adc18e89ebf478b08904b9a73b17176c03068f8711dac6353e6ab4b3fdaf4051eda05660cac31514520756973ec43d052ba9f42cb1ec9375c5d  expected-deviceinfo-mainline
+99c2c319335cf81dfbae9552bd0a78d26f03e95785d68c83faf16de2d86cd662016223872ccdfaf7f826813ec448dfb760fa9c8d949f8c2044e165b676454ead  devicepkg_subpackage_kernel.sh
+ca330f9f6771bdb13fe973c9a57a7718958b515e81ddb8a1ce54c4f8c7ef5907c8ab346e7aa1628e237945fccab0b3b70bf782c00ad318f71f0adcd839c1d966  deviceinfo
+9df20672cd7e6ee836a821cb671ec333beef4dfc1160c81d2afa007d1abe04a27798678a0a9def9ab4e9046e334fe7c4373b453994ffdc852b454db112702a9d  expected-deviceinfo-downstream
+a37dd9e355abf74d47f8e365fcd4876d99ef9a63bbb7be9e529057cb1e91778433d83e99339ee6401003f77cbc40ad3f14562bf9716b107ebad9da84b19ced0d  expected-deviceinfo-mainline
 "
diff --git a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
index 3e37ce6b3..fe4769fe9 100644
--- a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
+++ b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
@@ -38,6 +38,11 @@ if [ -f "$srcdir/modules-initfs.$kernel" ]; then
 	     > "$subpkgdir/usr/share/mkinitfs/files/00-$pkgname-modules.files"
 fi
 
+if [ -f "$srcdir/kernel-cmdline.$kernel.conf" ]; then
+	install -Dm644 "$srcdir/kernel-cmdline.$kernel.conf" \
+		"$subpkgdir/usr/lib/kernel-cmdline.d/50-$pkgname.conf"
+fi
+
 # Iterate over deviceinfo variables that have the kernel type as suffix
 # var looks like: deviceinfo_kernel_cmdline, ...
 grep -E "(.+)_$kernel=.*" "$deviceinfo" | \
diff --git a/main/devicepkg-dev/testdata/deviceinfo b/main/devicepkg-dev/testdata/deviceinfo
index fbd25cad3..e4d5b22b3 100644
--- a/main/devicepkg-dev/testdata/deviceinfo
+++ b/main/devicepkg-dev/testdata/deviceinfo
@@ -1,6 +1,3 @@
 deviceinfo_name="Test"
-deviceinfo_kernel_cmdline_downstream="androidboot.boot_recovery=1"
-deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200,n8"
-deviceinfo_kernel_cmdline_other="root=/dev/sda1 quiet splash"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_bootimg_qcdt_mainline="false"
diff --git a/main/devicepkg-dev/testdata/expected-deviceinfo-downstream b/main/devicepkg-dev/testdata/expected-deviceinfo-downstream
index adde02f02..0b4c0eae6 100644
--- a/main/devicepkg-dev/testdata/expected-deviceinfo-downstream
+++ b/main/devicepkg-dev/testdata/expected-deviceinfo-downstream
@@ -1,3 +1,2 @@
 deviceinfo_name="Test"
-deviceinfo_kernel_cmdline="androidboot.boot_recovery=1"
 deviceinfo_bootimg_qcdt="true"
diff --git a/main/devicepkg-dev/testdata/expected-deviceinfo-mainline b/main/devicepkg-dev/testdata/expected-deviceinfo-mainline
index 30c076f87..83662cd6a 100644
--- a/main/devicepkg-dev/testdata/expected-deviceinfo-mainline
+++ b/main/devicepkg-dev/testdata/expected-deviceinfo-mainline
@@ -1,3 +1,2 @@
 deviceinfo_name="Test"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8"
 deviceinfo_bootimg_qcdt="false"