diff --git a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4388.ebuild b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4389.ebuild
similarity index 82%
rename from chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4388.ebuild
rename to chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4389.ebuild
index 9232221..6211a7a 100644
--- a/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4388.ebuild
+++ b/chromeos-base/autotest-deps-camera-hal3/autotest-deps-camera-hal3-0.0.1-r4389.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7177.ebuild b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7178.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7177.ebuild
rename to chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7178.ebuild
index 15e07fb..74e79c8 100644
--- a/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7177.ebuild
+++ b/chromeos-base/autotest-deps-cellular/autotest-deps-cellular-0.0.1-r7178.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r3061.ebuild b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3062.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3061.ebuild
rename to chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3062.ebuild
index 915404d..5cc1223 100644
--- a/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3061.ebuild
+++ b/chromeos-base/autotest-deps-dbus/autotest-deps-dbus-0.0.1-r3062.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r7548.ebuild b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7549.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7548.ebuild
rename to chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7549.ebuild
index 6f3ed05..71c244d 100644
--- a/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7548.ebuild
+++ b/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r7549.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r7528.ebuild b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7529.ebuild
similarity index 84%
rename from chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7528.ebuild
rename to chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7529.ebuild
index 12b3907..7a68a99 100644
--- a/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7528.ebuild
+++ b/chromeos-base/autotest-deps-graphics/autotest-deps-graphics-0.0.1-r7529.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7140.ebuild b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7141.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7140.ebuild
rename to chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7141.ebuild
index 08bb218..faa2ddb 100644
--- a/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7140.ebuild
+++ b/chromeos-base/autotest-deps-p2p/autotest-deps-p2p-0.0.1-r7141.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11791.ebuild b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11792.ebuild
similarity index 90%
rename from chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11791.ebuild
rename to chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11792.ebuild
index 7d9386d..111463d 100644
--- a/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11791.ebuild
+++ b/chromeos-base/autotest-deps-piglit/autotest-deps-piglit-0.0.1-r11792.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r3137.ebuild b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3138.ebuild
similarity index 87%
rename from chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3137.ebuild
rename to chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3138.ebuild
index 2563a97..0e9b54d 100644
--- a/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3137.ebuild
+++ b/chromeos-base/autotest-deps-policy/autotest-deps-policy-0.0.1-r3138.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r8150.ebuild b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8151.ebuild
similarity index 86%
rename from chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8150.ebuild
rename to chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8151.ebuild
index 1840a5a..5410c47 100644
--- a/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8150.ebuild
+++ b/chromeos-base/autotest-deps-touchpad/autotest-deps-touchpad-0.0.1-r8151.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7700.ebuild b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7701.ebuild
similarity index 83%
rename from chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7700.ebuild
rename to chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7701.ebuild
index a43e977..2cf8d48 100644
--- a/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7700.ebuild
+++ b/chromeos-base/autotest-deps-webgl-mpd/autotest-deps-webgl-mpd-0.0.1-r7701.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 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-r12367.ebuild b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12368.ebuild
similarity index 91%
rename from chromeos-base/autotest-deps/autotest-deps-0.0.4-r12367.ebuild
rename to chromeos-base/autotest-deps/autotest-deps-0.0.4-r12368.ebuild
index 67b3b71..98a6a98 100644
--- a/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12367.ebuild
+++ b/chromeos-base/autotest-deps/autotest-deps-0.0.4-r12368.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3238.ebuild b/chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3239.ebuild
similarity index 90%
rename from chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3238.ebuild
rename to chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3239.ebuild
index 7bc9ec4..fc07f22 100644
--- a/chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3238.ebuild
+++ b/chromeos-base/autotest-tests-graphics/autotest-tests-graphics-0.0.1-r3239.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="edf345c66d0eece43912c9c813a24825fdd338dd"
-CROS_WORKON_TREE="0403c48eb6c76d705968f240a92353631701a279"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r723.ebuild b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r724.ebuild
similarity index 83%
rename from chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r723.ebuild
rename to chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r724.ebuild
index 613a45b..872465b 100644
--- a/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r723.ebuild
+++ b/chromeos-base/autotest-tests-vm-host/autotest-tests-vm-host-0.0.1-r724.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/autotest/autotest-0.0.2-r12373.ebuild b/chromeos-base/autotest/autotest-0.0.2-r12374.ebuild
similarity index 95%
rename from chromeos-base/autotest/autotest-0.0.2-r12373.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r12374.ebuild
index eb8f1d5..e7f7cc1 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r12373.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r12374.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("9062f7a7e3a03817f52d58db7c9c581959ae06cd" "2cb866695fbb3116da52288b3e8e889efce581cd")
-CROS_WORKON_TREE=("006ccf150e1192ee6e876bb574eda38c2dd2a235" "d6769575b1b3250bf6d94b7ecab573ad37753e32")
+CROS_WORKON_COMMIT=("8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12" "2cb866695fbb3116da52288b3e8e889efce581cd")
+CROS_WORKON_TREE=("c434e3cda69de41014048ca7d58d7321bc3b1c71" "d6769575b1b3250bf6d94b7ecab573ad37753e32")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/crostini_client/crostini_client-0.1.0-r54.ebuild b/chromeos-base/crostini_client/crostini_client-0.1.0-r55.ebuild
similarity index 91%
rename from chromeos-base/crostini_client/crostini_client-0.1.0-r54.ebuild
rename to chromeos-base/crostini_client/crostini_client-0.1.0-r55.ebuild
index 2667441..e08149c 100644
--- a/chromeos-base/crostini_client/crostini_client-0.1.0-r54.ebuild
+++ b/chromeos-base/crostini_client/crostini_client-0.1.0-r55.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-CROS_WORKON_COMMIT="2a1e4bf11126c6911f994f37cee6798b37a79cbd"
-CROS_WORKON_TREE="7b9b958444461dbad59569baa6017c9a78734413"
+CROS_WORKON_COMMIT="d3f5e582291eaf79e83aff5903a48694bf3e6bd1"
+CROS_WORKON_TREE="6ba8b55ff1a7eab019fd1e9b237f2c09349fd544"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE="vm_tools/crostini_client"
diff --git a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3220.ebuild b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3221.ebuild
similarity index 81%
rename from chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3220.ebuild
rename to chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3221.ebuild
index 4627adb..5b581a8 100644
--- a/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3220.ebuild
+++ b/chromeos-base/toolchain-tests/toolchain-tests-0.0.1-r3221.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9062f7a7e3a03817f52d58db7c9c581959ae06cd"
-CROS_WORKON_TREE="006ccf150e1192ee6e876bb574eda38c2dd2a235"
+CROS_WORKON_COMMIT="8559cbc24a6b13a4638e5cbfb1c33e391e1a3f12"
+CROS_WORKON_TREE="c434e3cda69de41014048ca7d58d7321bc3b1c71"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME="third_party/autotest/files"
 
diff --git a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r800.ebuild b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r801.ebuild
similarity index 92%
rename from chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r800.ebuild
rename to chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r801.ebuild
index 57839cc..ca02d43 100644
--- a/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r800.ebuild
+++ b/chromeos-base/vm_guest_tools/vm_guest_tools-0.0.2-r801.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7fa6b93bf01de918f1cf31347ca4afa89086f353"
-CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "5b529297c550287d6a523a6d12561b53776f10f9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d3f5e582291eaf79e83aff5903a48694bf3e6bd1"
+CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "7fb77e93ded63c5a71337cfe0d1187566001a344" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r950.ebuild b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r951.ebuild
similarity index 95%
rename from chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r950.ebuild
rename to chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r951.ebuild
index 5027a0f..7f990e6 100644
--- a/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r950.ebuild
+++ b/chromeos-base/vm_host_tools/vm_host_tools-0.0.2-r951.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7fa6b93bf01de918f1cf31347ca4afa89086f353"
-CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "b0803859a28264270dbda45f840272b5211502c7" "5b529297c550287d6a523a6d12561b53776f10f9" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="d3f5e582291eaf79e83aff5903a48694bf3e6bd1"
+CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "b0803859a28264270dbda45f840272b5211502c7" "7fb77e93ded63c5a71337cfe0d1187566001a344" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1199.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1200.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1199.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1200.ebuild
index 5aa19cd..49f359b 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1199.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1200.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="78de3279ae61f369043124fd563eeb993f05fec8"
-CROS_WORKON_TREE="c49caddfa37c7217b14f44d0ae640e0fc4b8d558"
+CROS_WORKON_COMMIT="d3f5e582291eaf79e83aff5903a48694bf3e6bd1"
+CROS_WORKON_TREE="0946ecef7bf4fde74110fda309254a95b3efbf54"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r832.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r833.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r832.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r833.ebuild
index 6384631..f21bf05 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r832.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r833.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="7f2e5f2282628ade336379950cf25316d89a8a19"
-CROS_WORKON_TREE="7f6ce0c751d268daf3cd06e26abf7c19696b124c"
+CROS_WORKON_COMMIT="86d670eab301cfacd1a1472e2ee1d6c5c9bca1b5"
+CROS_WORKON_TREE="b8ccf568c98d68fdf66f07da7c17209a712185d0"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"