diff --git a/chromeos-base/quipper/quipper-0.0.1-r2669.ebuild b/chromeos-base/quipper/quipper-0.0.1-r2670.ebuild
similarity index 94%
rename from chromeos-base/quipper/quipper-0.0.1-r2669.ebuild
rename to chromeos-base/quipper/quipper-0.0.1-r2670.ebuild
index 7adaf97..015f081 100644
--- a/chromeos-base/quipper/quipper-0.0.1-r2669.ebuild
+++ b/chromeos-base/quipper/quipper-0.0.1-r2670.ebuild
@@ -4,7 +4,7 @@
 # Don't use Makefile.external here as it fetches from the network.
 EAPI=7
 
-CROS_WORKON_COMMIT="44f59350093e5229cb968ea17bf86ae52dca9ac3"
+CROS_WORKON_COMMIT="0598acb73ca7269435e8c2f8d797d209cc04a764"
 CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 
@@ -55,6 +55,7 @@
 	mv "${SRC_DIR}"/{.[!.],}* ./ || die
 	eapply "${FILESDIR}"/quipper-disable-flaky-tests.patch
 	eapply "${FILESDIR}"/quipper-arraysize.patch
+	eapply "${FILESDIR}"/quipper-check-header.patch
 	popd >/dev/null
 }
 
diff --git a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1348.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild
similarity index 97%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1348.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild
index 7a4d77e..a971972 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1348.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r1349.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0f309d00c4a64c0cfc5eeb6c1a045ef1153b09a0"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "6ac391aa2da8e29cd4de58f7f7b489a9dc053382" "c1bde153626532428bf7409bc0597e79452c5eb8" "01162da167ac566d9126a032da1b74f8889e9fa2" "907716bfe67b55f9dfd0b8d281d18b37103301f5" "1780a540acb435bb7583751430df696e44eef2e3" "50eebbe92f169d998a08ba8710d37dcef439b47d" "edcdfbcab4b3c4525ccb60500aa145d24cafd7f7" "27d31e84486e3c2a8fcf2deb13b46af8311bbae9" "82e4b5c7e0ce0efa9061a09d81555845183e8d63" "dcc85a40b5c9518fac5d6d9b571131998bd62653" "4b930736bc7da8c301f27c7a82718e7d605de289" "04812f95a99341b51d5b838c9470f7915b2a5f11" "91eccc114d7ae139f67d386eae13e0cccb5ce4a3")
+CROS_WORKON_COMMIT="0598acb73ca7269435e8c2f8d797d209cc04a764"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7ef75a42aba67052842459f221271e681184cc89" "6ac391aa2da8e29cd4de58f7f7b489a9dc053382" "c1bde153626532428bf7409bc0597e79452c5eb8" "01162da167ac566d9126a032da1b74f8889e9fa2" "7418121e64c49c654817d862e1474490986f4278" "1780a540acb435bb7583751430df696e44eef2e3" "50eebbe92f169d998a08ba8710d37dcef439b47d" "edcdfbcab4b3c4525ccb60500aa145d24cafd7f7" "27d31e84486e3c2a8fcf2deb13b46af8311bbae9" "82e4b5c7e0ce0efa9061a09d81555845183e8d63" "dcc85a40b5c9518fac5d6d9b571131998bd62653" "4b930736bc7da8c301f27c7a82718e7d605de289" "04812f95a99341b51d5b838c9470f7915b2a5f11" "91eccc114d7ae139f67d386eae13e0cccb5ce4a3")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4886.ebuild b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4887.ebuild
similarity index 89%
rename from sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4886.ebuild
rename to sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4887.ebuild
index f8aea00..195b661 100644
--- a/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4886.ebuild
+++ b/sys-apps/coreboot-utils/coreboot-utils-0.0.1-r4887.ebuild
@@ -3,8 +3,8 @@
 # $Header:
 
 EAPI=7
-CROS_WORKON_COMMIT=("14a4eb6e112b3064c2ba0e228193bb3a1eba3036" "4e982f1c39da417100e4021fb1c2c370da5f8dd6")
-CROS_WORKON_TREE=("799331977582570b4553d5b8ecf53f17828b8175" "0e26966d3f2069b8ac7134030bcdf1022620e54b" "f1b8475bdf2131616c1e148087f139206604b5de" "7970bef34ce4d0b3023def52ff72e1c4cd2eca85" "1f141a99a47f4c9edd8fdf11508f24cee865b31e" "b4d9967f57ddca241d0a031c5d403e9da7088608" "c4524c42dcd8ee9f61dc34d99e71983e065c591c" "181b7ecc670fb8b8481356d96e48592587a73c68" "e03866d9ecdf3529248f3d4bd0b63499a092f2c3" "974edbc79de4f730edf8c9d01bc9186f97417f1d" "bfef75f3a17da232f402e1799b42c25c2b1c5176" "327b75387dd5fa21a18900c37c6017c6378024be" "f0e6fefacbfcbd78417e52a97ba25032cf8fa1ed" "357d07fc1526ad76c1a186e437b7736e3a254d65" "b7c12429dc024e81ca28d48672718336134c64e5" "362eda536c1c8032f60673bd7943efd3bd9dfb7a")
+CROS_WORKON_COMMIT=("2c22585ae3b677eddc44c3f765335eaf4c52996b" "4e982f1c39da417100e4021fb1c2c370da5f8dd6")
+CROS_WORKON_TREE=("799331977582570b4553d5b8ecf53f17828b8175" "0e26966d3f2069b8ac7134030bcdf1022620e54b" "26ff521c4d8392771e176e6f45dc29c582bff369" "7970bef34ce4d0b3023def52ff72e1c4cd2eca85" "1f141a99a47f4c9edd8fdf11508f24cee865b31e" "2928430a62aab173b801749223f89a315b2f5e1c" "c4524c42dcd8ee9f61dc34d99e71983e065c591c" "181b7ecc670fb8b8481356d96e48592587a73c68" "e03866d9ecdf3529248f3d4bd0b63499a092f2c3" "974edbc79de4f730edf8c9d01bc9186f97417f1d" "bfef75f3a17da232f402e1799b42c25c2b1c5176" "327b75387dd5fa21a18900c37c6017c6378024be" "f0e6fefacbfcbd78417e52a97ba25032cf8fa1ed" "357d07fc1526ad76c1a186e437b7736e3a254d65" "b7c12429dc024e81ca28d48672718336134c64e5" "362eda536c1c8032f60673bd7943efd3bd9dfb7a")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/coreboot"
 	"chromiumos/platform/vboot_reference"
diff --git a/sys-apps/fwupd/fwupd-1.6.1-r124.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r125.ebuild
similarity index 97%
rename from sys-apps/fwupd/fwupd-1.6.1-r124.ebuild
rename to sys-apps/fwupd/fwupd-1.6.1-r125.ebuild
index d53a3a2..3530fe8 100644
--- a/sys-apps/fwupd/fwupd-1.6.1-r124.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r125.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="e0efa1e617509aeffcfa7ac986a57636c0881862"
-CROS_WORKON_TREE="c795db73a250ee585ccc4adc2a24a992849cf36f"
+CROS_WORKON_COMMIT="d58dc03c286db4c16f5d2f04ef258abf350f502a"
+CROS_WORKON_TREE="3445c6105d04d1a045d86e4d9d25bbadd2953cf9"
 CROS_WORKON_PROJECT="chromiumos/third_party/fwupd"
 CROS_WORKON_EGIT_BRANCH="fwupd-1.6.1"
 
diff --git a/sys-boot/coreboot/coreboot-0.0.1-r4452.ebuild b/sys-boot/coreboot/coreboot-0.0.1-r4453.ebuild
similarity index 98%
rename from sys-boot/coreboot/coreboot-0.0.1-r4452.ebuild
rename to sys-boot/coreboot/coreboot-0.0.1-r4453.ebuild
index 2c95649..c767680 100644
--- a/sys-boot/coreboot/coreboot-0.0.1-r4452.ebuild
+++ b/sys-boot/coreboot/coreboot-0.0.1-r4453.ebuild
@@ -6,8 +6,8 @@
 # VERSION=REVBUMP-0.0.70
 
 EAPI=7
-CROS_WORKON_COMMIT=("4aa2715f9e4cdce78c133790804c64a3b408b44f" "967344b52082725523ed6146b54e8c8a077bfeb6" "4e982f1c39da417100e4021fb1c2c370da5f8dd6" "7874c7d3cebc0ebca57875e24911ddd55aec9711" "df630442ada121d52205f009fdab685401f53694" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
-CROS_WORKON_TREE=("befd64c5dc4f20eafb353f1c49850ec4eb508679" "d6d71de60d72b25dfa814f04f38f6e1f874fe88e" "658c9539ddd1841087da6d742e4c2d999cb3e6e1" "27bb5107ef257116a45f756ad185272ae385faf9" "71e64b41a2f07ca30f4745b73c3964bc3c59dcf2" "45d22a8711f85c4310c0c2121d3dc8a72793d375" "c0433b88f972fa26dded401be022c1c026cd644e")
+CROS_WORKON_COMMIT=("2c22585ae3b677eddc44c3f765335eaf4c52996b" "967344b52082725523ed6146b54e8c8a077bfeb6" "4e982f1c39da417100e4021fb1c2c370da5f8dd6" "7874c7d3cebc0ebca57875e24911ddd55aec9711" "df630442ada121d52205f009fdab685401f53694" "ee319ae7bc59e88b60142f40a9ec1b46656de4db" "b7d5b2d6a6dd05874d86ee900ff441d261f9034c")
+CROS_WORKON_TREE=("6193c482de2a2ba04d2979fabb2d7f41116b2813" "d6d71de60d72b25dfa814f04f38f6e1f874fe88e" "658c9539ddd1841087da6d742e4c2d999cb3e6e1" "27bb5107ef257116a45f756ad185272ae385faf9" "71e64b41a2f07ca30f4745b73c3964bc3c59dcf2" "45d22a8711f85c4310c0c2121d3dc8a72793d375" "c0433b88f972fa26dded401be022c1c026cd644e")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/coreboot"
 	"chromiumos/third_party/arm-trusted-firmware"
diff --git a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r473.ebuild b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r474.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r473.ebuild
rename to sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r474.ebuild
index 1313cbb8..e23ae67 100644
--- a/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r473.ebuild
+++ b/sys-kernel/chromeos-kernel-5_10/chromeos-kernel-5_10-5.10.45-r474.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="602aef068aab9a43d08819be47cb0b8ced4e49af"
-CROS_WORKON_TREE="abbec7cb9afa8901ab4a35e2da0edb1dbe04adf7"
+CROS_WORKON_COMMIT="0eda0589eaf4c9677d419a15cf029adebb99f4c9"
+CROS_WORKON_TREE="9b1d3f62b04069646b2c87da547f24d2af25e98b"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.10"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.10"