diff --git a/chromeos-base/attestation/attestation-0.0.1-r3187.ebuild b/chromeos-base/attestation/attestation-0.0.1-r3188.ebuild
similarity index 93%
rename from chromeos-base/attestation/attestation-0.0.1-r3187.ebuild
rename to chromeos-base/attestation/attestation-0.0.1-r3188.ebuild
index 605f9184..e2ce139 100644
--- a/chromeos-base/attestation/attestation-0.0.1-r3187.ebuild
+++ b/chromeos-base/attestation/attestation-0.0.1-r3188.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="6f9011123f3656c45bb34148673aa110a22326b3"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8a6aa0783afea740fe52cec225aef91187cbcde6" "5a5465a0f498bb248c8f9fd75c10bd064c738244" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "a06a3f47395fb7b584188c6852764bc773e5497e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8a6aa0783afea740fe52cec225aef91187cbcde6" "8640df3a4aff4084b644aeefc4d31752a1d97665" "81dfbbc1756a3b4224b447e7bf10a916d97c4f66" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "a06a3f47395fb7b584188c6852764bc773e5497e" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/chaps/chaps-0.0.1-r3375.ebuild b/chromeos-base/chaps/chaps-0.0.1-r3376.ebuild
similarity index 95%
rename from chromeos-base/chaps/chaps-0.0.1-r3375.ebuild
rename to chromeos-base/chaps/chaps-0.0.1-r3376.ebuild
index 6545b53..4465f9b 100644
--- a/chromeos-base/chaps/chaps-0.0.1-r3375.ebuild
+++ b/chromeos-base/chaps/chaps-0.0.1-r3376.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f563528fd35a0e55348afa3545ed57af4b86bdbc"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "5a5465a0f498bb248c8f9fd75c10bd064c738244" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "a06a3f47395fb7b584188c6852764bc773e5497e" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "8640df3a4aff4084b644aeefc4d31752a1d97665" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "a06a3f47395fb7b584188c6852764bc773e5497e" "8cc20aa2c0f7a2d6b073576b3e41ac39c9be2df6" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r272.ebuild b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r273.ebuild
similarity index 86%
rename from chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r272.ebuild
rename to chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r273.ebuild
index 7e17f5f..2c89d46 100644
--- a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r272.ebuild
+++ b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r273.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("81dd5615011f9417f91d41669acec9e9c4430d7f" "5dc77b6fedf9e41acabf786558d90a7915d0edb3")
-CROS_WORKON_TREE=("26bbcbef154a44e78d52b07eb97332643f03e647" "5f1dbda716f17bf8a9b2a0a73cfd7eaf4a54e9f5")
+CROS_WORKON_COMMIT=("81dd5615011f9417f91d41669acec9e9c4430d7f" "4ed4794426ad9db2921551cfe470619175b10189")
+CROS_WORKON_TREE=("26bbcbef154a44e78d52b07eb97332643f03e647" "244de1ff90858e0ae56b2d8e920a4ce87ac0fa0c")
 CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/chromite")
 CROS_WORKON_LOCALNAME=("platform/factory" "../chromite")
 CROS_WORKON_SUBTREE=("py" "lib")
diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2587.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2588.ebuild
similarity index 80%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2587.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2588.ebuild
index 440cc67..59b3a9f 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2587.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2588.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="64946bc6c6ac6a15597032d72f7c15fc346aeefb"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b83389faf851f92134fa3108f7577851cb4dffa3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "c4ab24982f8916bc61640a3912b5c1d0337b758f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r358.ebuild b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r359.ebuild
similarity index 84%
rename from chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r358.ebuild
rename to chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r359.ebuild
index 4e12ca8..c54a52b 100644
--- a/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r358.ebuild
+++ b/chromeos-base/shill-dbus-client/shill-dbus-client-0.0.1-r359.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="64946bc6c6ac6a15597032d72f7c15fc346aeefb"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b83389faf851f92134fa3108f7577851cb4dffa3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "c4ab24982f8916bc61640a3912b5c1d0337b758f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill-net/shill-net-0.0.1-r434.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r435.ebuild
similarity index 85%
rename from chromeos-base/shill-net/shill-net-0.0.1-r434.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r435.ebuild
index f2a2de4..1496c85 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r434.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r435.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="64946bc6c6ac6a15597032d72f7c15fc346aeefb"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "b83389faf851f92134fa3108f7577851cb4dffa3" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "c4ab24982f8916bc61640a3912b5c1d0337b758f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/shill/shill-0.0.5-r2701.ebuild b/chromeos-base/shill/shill-0.0.5-r2702.ebuild
similarity index 96%
rename from chromeos-base/shill/shill-0.0.5-r2701.ebuild
rename to chromeos-base/shill/shill-0.0.5-r2702.ebuild
index 1dd304c..aac98f6 100644
--- a/chromeos-base/shill/shill-0.0.5-r2701.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r2702.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="64946bc6c6ac6a15597032d72f7c15fc346aeefb"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "eae0546f4ee5132d4544af4770755eb05f60cba6" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "b83389faf851f92134fa3108f7577851cb4dffa3" "21f1f0db051f75ae383e9fbc5033144420bbbdfe" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "eae0546f4ee5132d4544af4770755eb05f60cba6" "a9708ef639f0f7929195d0f3921ebd1a12ad96bd" "c4ab24982f8916bc61640a3912b5c1d0337b758f" "767a114667a7ed090f12adcaca93e7d4ef6f034f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6660.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6661.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6660.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6661.ebuild
index 09bb25c..378901c 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6660.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6661.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("04585d0059df0bdd849296b4cb3e924635161c80" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a")
-CROS_WORKON_TREE=("8700251cab92668fcfc1d0d50c8cc1dc77a755b5" "f962a7d69f70f98e292bc4a8161b165a1d3af867")
+CROS_WORKON_COMMIT=("19600a1b0052600cee2be40fe94730f604e742c4" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a")
+CROS_WORKON_TREE=("4d385780a93c6d40dfad2c2f6201aff928c60773" "f962a7d69f70f98e292bc4a8161b165a1d3af867")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6710.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6711.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6710.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6711.ebuild
index 655c622..37644a5 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6710.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6711.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("04585d0059df0bdd849296b4cb3e924635161c80" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
-CROS_WORKON_TREE=("8700251cab92668fcfc1d0d50c8cc1dc77a755b5" "f962a7d69f70f98e292bc4a8161b165a1d3af867" "19a599e153588e7beddcc62b22f526879f2985cf")
+CROS_WORKON_COMMIT=("19600a1b0052600cee2be40fe94730f604e742c4" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
+CROS_WORKON_TREE=("4d385780a93c6d40dfad2c2f6201aff928c60773" "f962a7d69f70f98e292bc4a8161b165a1d3af867" "19a599e153588e7beddcc62b22f526879f2985cf")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2797.ebuild b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2798.ebuild
similarity index 84%
rename from chromeos-base/vpn-manager/vpn-manager-0.0.1-r2797.ebuild
rename to chromeos-base/vpn-manager/vpn-manager-0.0.1-r2798.ebuild
index c47fb70..02cc757 100644
--- a/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2797.ebuild
+++ b/chromeos-base/vpn-manager/vpn-manager-0.0.1-r2798.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c8356149dd3addec8ddef84545cf8a9dc8530f01"
-CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "21f1f0db051f75ae383e9fbc5033144420bbbdfe" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d27dfb81bc87df4db16849f5da1b96f1cf5cd10b"
+CROS_WORKON_TREE=("791c6808b4f4f5f1c484108d66ff958d65f8f1e3" "767a114667a7ed090f12adcaca93e7d4ef6f034f" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2361.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2362.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2361.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2362.ebuild
index e4bdf5a..254e919 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2361.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.128-r2362.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5191b417e53ea04b41f049d366de558294a9db15"
-CROS_WORKON_TREE="e05b1574091c27dcab9ce9a9681a37d8a59f07fc"
+CROS_WORKON_COMMIT="686e2baf4c9b63cf85be71074565b76bb95b9b67"
+CROS_WORKON_TREE="d2088f2a2ad01abfc14810345aa1f171011ad20a"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"