diff --git a/chromeos-base/cros-disks/cros-disks-0.0.1-r2983.ebuild b/chromeos-base/cros-disks/cros-disks-0.0.1-r2984.ebuild
similarity index 94%
rename from chromeos-base/cros-disks/cros-disks-0.0.1-r2983.ebuild
rename to chromeos-base/cros-disks/cros-disks-0.0.1-r2984.ebuild
index 77ac2fe..6c812fa 100644
--- a/chromeos-base/cros-disks/cros-disks-0.0.1-r2983.ebuild
+++ b/chromeos-base/cros-disks/cros-disks-0.0.1-r2984.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c7fcbb5ae76c36f9401814146af596d58cbc8571"
-CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "dfcb42470083ae16bfb22a076628f44029b5054f" "7e189936f29d145c4191ea147e48256c92fac75d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="7f7a4161f52043ce96594a40d0ded9f7312f36ef"
+CROS_WORKON_TREE=("eec5ce9cfadd268344b02efdbec7465fbc391a9e" "d33429eb2beae40afd4d90194f8571339ed6258c" "7e189936f29d145c4191ea147e48256c92fac75d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD="1"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r712.ebuild b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r713.ebuild
similarity index 90%
rename from chromeos-base/tast-cmd/tast-cmd-0.0.1-r712.ebuild
rename to chromeos-base/tast-cmd/tast-cmd-0.0.1-r713.ebuild
index 9bc6362..6d2dbaf 100644
--- a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r712.ebuild
+++ b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r713.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9120787efdec275cf95165c57eb8c723a1615dbb"
-CROS_WORKON_TREE="eaf0e0913c2929f713869d5cbb3475bf47f7a934"
+CROS_WORKON_COMMIT="7a1134432b44899551e9dc71e44f1b080fbb662e"
+CROS_WORKON_TREE="80f35c13613f3811f7a83997518db50e93be466d"
 CROS_WORKON_PROJECT="chromiumos/platform/tast"
 CROS_WORKON_LOCALNAME="platform/tast"
 
diff --git a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r663.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r664.ebuild
similarity index 88%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r663.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r664.ebuild
index ed85b51..265e0d5 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r663.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r664.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="9120787efdec275cf95165c57eb8c723a1615dbb"
-CROS_WORKON_TREE="eaf0e0913c2929f713869d5cbb3475bf47f7a934"
+CROS_WORKON_COMMIT="7a1134432b44899551e9dc71e44f1b080fbb662e"
+CROS_WORKON_TREE="80f35c13613f3811f7a83997518db50e93be466d"
 CROS_WORKON_PROJECT="chromiumos/platform/tast"
 CROS_WORKON_LOCALNAME="platform/tast"
 
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3120.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3121.ebuild
similarity index 90%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3120.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3121.ebuild
index a851e15..3388dd7 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3120.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3121.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("37577db806241fd75fe8fb05533dba92abba6652" "9120787efdec275cf95165c57eb8c723a1615dbb")
-CROS_WORKON_TREE=("207aa587d492b64ab78c55d76fa3dbf44fbe6085" "eaf0e0913c2929f713869d5cbb3475bf47f7a934")
+CROS_WORKON_COMMIT=("37577db806241fd75fe8fb05533dba92abba6652" "7a1134432b44899551e9dc71e44f1b080fbb662e")
+CROS_WORKON_TREE=("207aa587d492b64ab78c55d76fa3dbf44fbe6085" "80f35c13613f3811f7a83997518db50e93be466d")
 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-r3126.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3127.ebuild
similarity index 85%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3126.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3127.ebuild
index 5e1bba2..d495183 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3126.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3127.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("37577db806241fd75fe8fb05533dba92abba6652" "9120787efdec275cf95165c57eb8c723a1615dbb" "e45d88df6c96dcb818adf6506e334cd0f97430cf")
-CROS_WORKON_TREE=("207aa587d492b64ab78c55d76fa3dbf44fbe6085" "eaf0e0913c2929f713869d5cbb3475bf47f7a934" "59dedefa635c597c102f62e723bf08b78d0193ba")
+CROS_WORKON_COMMIT=("37577db806241fd75fe8fb05533dba92abba6652" "7a1134432b44899551e9dc71e44f1b080fbb662e" "e45d88df6c96dcb818adf6506e334cd0f97430cf")
+CROS_WORKON_TREE=("207aa587d492b64ab78c55d76fa3dbf44fbe6085" "80f35c13613f3811f7a83997518db50e93be466d" "59dedefa635c597c102f62e723bf08b78d0193ba")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1084.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1085.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1084.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1085.ebuild
index 1d7488e..52bb447 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1084.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1085.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="c7fcbb5ae76c36f9401814146af596d58cbc8571"
-CROS_WORKON_TREE="5b0de4e6a83ecdd22091ddc4cbcd6c22dc9d7496"
+CROS_WORKON_COMMIT="7f7a4161f52043ce96594a40d0ded9f7312f36ef"
+CROS_WORKON_TREE="415ab61ba803b5c5438b27465902e47df5321611"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"