diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10780.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10781.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10780.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10781.ebuild
index 0d423de..3949cbe 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10780.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r10781.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6664.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6665.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6664.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6665.ebuild
index 92b3b7c..094d53f 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6664.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r6665.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11151.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11152.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11151.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11152.ebuild
index 40a2c45..684a034 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11151.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r11152.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11131.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11132.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11131.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11132.ebuild
index 495d8d1..2419d3f 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11131.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r11132.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6740.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6741.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6740.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6741.ebuild
index ed2d7a5..b06318f 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6740.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r6741.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11755.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11756.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11755.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11756.ebuild
index 555a248..2590405 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11755.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r11756.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11303.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11304.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11303.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11304.ebuild
index e67e10d..25dceed 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11303.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r11304.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15973.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15974.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r15973.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r15974.ebuild
index eb273b5..9d41102 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15973.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r15974.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3690.ebuild b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3691.ebuild
similarity index 88%
rename from chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3690.ebuild
rename to chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3691.ebuild
index faa9a8e..5bd3f74 100644
--- a/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3690.ebuild
+++ b/chromeos-base/autotest-tests-arc-public/autotest-tests-arc-public-0.0.1-r3691.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r14.ebuild b/chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r15.ebuild
similarity index 87%
rename from chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r14.ebuild
rename to chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r15.ebuild
index cd8efc6..b7184cb 100644
--- a/chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r14.ebuild
+++ b/chromeos-base/autotest-tests-bluetooth/autotest-tests-bluetooth-0.0.1-r15.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="994b0e9fbc4622425230e729ef09b39e66e679e5"
-CROS_WORKON_TREE="a3ae580fd8d643980195b89816a63e8d6c61af34"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3869.ebuild b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3870.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3869.ebuild
rename to chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3870.ebuild
index 376314d..1314ed3 100644
--- a/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3869.ebuild
+++ b/chromeos-base/autotest-tests-debugd/autotest-tests-debugd-0.0.1-r3870.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r700.ebuild b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r701.ebuild
similarity index 85%
rename from chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r700.ebuild
rename to chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r701.ebuild
index 62bfbc1..6c1deac 100644
--- a/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r700.ebuild
+++ b/chromeos-base/autotest-tests-smbprovider/autotest-tests-smbprovider-0.0.1-r701.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4328.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4329.ebuild
similarity index 84%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4328.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4329.ebuild
index cc7ae75..9023deb 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4328.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r4329.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/chromeos-base/autotest/autotest-0.0.2-r16232.ebuild b/chromeos-base/autotest/autotest-0.0.2-r16233.ebuild
similarity index 96%
rename from chromeos-base/autotest/autotest-0.0.2-r16232.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r16233.ebuild
index f85eb2b..a4c5b82 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r16232.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r16233.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("f2887a57171cc80e62811787096384a6bd6b79a4" "7f05c2f0254be615ce1ed3e81f3cca5fc9f1f0e5" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
-CROS_WORKON_TREE=("4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
+CROS_WORKON_COMMIT=("7f9b91be4720de05d5edacf45cb9fc354276f557" "7f05c2f0254be615ce1ed3e81f3cca5fc9f1f0e5" "fdcd88182cfd3d40596011819c24bb4927e82d1e")
+CROS_WORKON_TREE=("5e1ee6ce4ed48a5878834b45a979c765e68944c4" "360559203d537727a34f0267da818a5260a642fa" "3b88e01b4c689a52c6a8eed97043023877ad2278")
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT=(
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6826.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6827.ebuild
similarity index 84%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6826.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6827.ebuild
index 72a0131..46af6e8 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6826.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r6827.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="f2887a57171cc80e62811787096384a6bd6b79a4"
-CROS_WORKON_TREE="4f33e8f6e87d80d4aff1b4e652c9ac590e0b0823"
+CROS_WORKON_COMMIT="7f9b91be4720de05d5edacf45cb9fc354276f557"
+CROS_WORKON_TREE="5e1ee6ce4ed48a5878834b45a979c765e68944c4"
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3325.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3326.ebuild
similarity index 92%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3325.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3326.ebuild
index 2923d72..b731dc18 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3325.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.210-r3326.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="b9d16452044b24294c6108d208b5facd621cfa33"
-CROS_WORKON_TREE="51c3ffc090ed9cf521973ff0e383875a5abea256"
+CROS_WORKON_COMMIT="c22716259e5593166767b4f6074cc199681904eb"
+CROS_WORKON_TREE="1f2c52e9b1f66d1066b3dae55e355ea52b888509"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"