diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 76c188657..b95b1342b 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-dev
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -63,7 +63,7 @@ package() {
 sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 30f116f668bad60a0e62ef3e0625c331a1b044f5bbd137eb7b909039675f4aefca7e0206b755167b834aabd31fcf28b53c6f1a61782da66fd05f9dfcd09c0664  devicepkg_build.sh
 74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4  devicepkg_package.sh
-f7583b92a27b39d79762700a48853b8d641845cdd45eb875d6fddc236f4d70598927d4dfc7d237870617b77b42820686692a68220f610dbc01c76402d9edfb2e  downstreamkernel_prepare.sh
+53aa129da5bd52376271bbd37ed7205f2dac971d442c5085260ed1c4a9b014a656cbe28ea45d242be60a2d0f8851611f3b8352c880c017995cda6ae093e5d324  downstreamkernel_prepare.sh
 776d7c36afc7bedbd531641abe90fa4bf06a519ad9e300dedf67b6d3b4997b57a398938dd528d5eeda6d17e0d34644472702a4fdd8ff41e0a4a7ad0671f4a216  downstreamkernel_package.sh
 cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8  devicepkg_subpackage_kernel.sh
 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3  deviceinfo
diff --git a/main/devicepkg-dev/downstreamkernel_prepare.sh b/main/devicepkg-dev/downstreamkernel_prepare.sh
index 46593989c..22d7e8c00 100644
--- a/main/devicepkg-dev/downstreamkernel_prepare.sh
+++ b/main/devicepkg-dev/downstreamkernel_prepare.sh
@@ -41,6 +41,7 @@ install_gcc_h
 
 # Remove -Werror from all makefiles
 makefiles="$(find "$builddir" -type f -name Makefile)
+	$(find "$builddir" -type f -name Makefile.common)
 	$(find "$builddir" -type f -name Kbuild)"
 for i in $makefiles; do
 	sed -i 's/-Werror-/-W/g' "$i"