diff --git a/chromeos-base/shill-client/shill-client-0.0.1-r2170.ebuild b/chromeos-base/shill-client/shill-client-0.0.1-r2171.ebuild
similarity index 80%
rename from chromeos-base/shill-client/shill-client-0.0.1-r2170.ebuild
rename to chromeos-base/shill-client/shill-client-0.0.1-r2171.ebuild
index b6e5746..ece4bd2 100644
--- a/chromeos-base/shill-client/shill-client-0.0.1-r2170.ebuild
+++ b/chromeos-base/shill-client/shill-client-0.0.1-r2171.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0a70acf40b774cf9c5d4f41cb5787d3862ca9348"
-CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "7c400445b4ae74c9a1f673f1aaebed6f9df24894" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="ea08436d83146f029bedd71261d4f9c893deb0c3"
+CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "0cd7233a357d826d46584d3f7ba9f2de99ed94a7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/shill-net/shill-net-0.0.1-r16.ebuild b/chromeos-base/shill-net/shill-net-0.0.1-r17.ebuild
similarity index 88%
rename from chromeos-base/shill-net/shill-net-0.0.1-r16.ebuild
rename to chromeos-base/shill-net/shill-net-0.0.1-r17.ebuild
index 63ed273..29394683 100644
--- a/chromeos-base/shill-net/shill-net-0.0.1-r16.ebuild
+++ b/chromeos-base/shill-net/shill-net-0.0.1-r17.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0a70acf40b774cf9c5d4f41cb5787d3862ca9348"
-CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "7c400445b4ae74c9a1f673f1aaebed6f9df24894" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="ea08436d83146f029bedd71261d4f9c893deb0c3"
+CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "0cd7233a357d826d46584d3f7ba9f2de99ed94a7" "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-r2230.ebuild b/chromeos-base/shill/shill-0.0.5-r2231.ebuild
similarity index 97%
rename from chromeos-base/shill/shill-0.0.5-r2230.ebuild
rename to chromeos-base/shill/shill-0.0.5-r2231.ebuild
index 3f2a563..7e2bca1 100644
--- a/chromeos-base/shill/shill-0.0.5-r2230.ebuild
+++ b/chromeos-base/shill/shill-0.0.5-r2231.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="0a70acf40b774cf9c5d4f41cb5787d3862ca9348"
-CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "377caa22e8416ce2388b9c099e85be393001947f" "aa7d3a7ee39fb0cab54fef530db4dfcbe0cd4515" "7c400445b4ae74c9a1f673f1aaebed6f9df24894" "963e076a0b7311a4a5e1c14646f9a5d50c209ef7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="ea08436d83146f029bedd71261d4f9c893deb0c3"
+CROS_WORKON_TREE=("aa81756947ecfdd38b22f42eed8eeafa40431079" "377caa22e8416ce2388b9c099e85be393001947f" "aa7d3a7ee39fb0cab54fef530db4dfcbe0cd4515" "0cd7233a357d826d46584d3f7ba9f2de99ed94a7" "963e076a0b7311a4a5e1c14646f9a5d50c209ef7" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
diff --git a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r805.ebuild b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r806.ebuild
similarity index 90%
rename from chromeos-base/tast-cmd/tast-cmd-0.0.1-r805.ebuild
rename to chromeos-base/tast-cmd/tast-cmd-0.0.1-r806.ebuild
index 8296bac..2159b67 100644
--- a/chromeos-base/tast-cmd/tast-cmd-0.0.1-r805.ebuild
+++ b/chromeos-base/tast-cmd/tast-cmd-0.0.1-r806.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2ad1b5ed63ac152ca9c5f907c9e093e16b14725a"
-CROS_WORKON_TREE="00cb282746732284a2779c7d4e7dc75c5948f2ec"
+CROS_WORKON_COMMIT="bfa58941f4135385da3fa4eafcb220a691ce381d"
+CROS_WORKON_TREE="d365639c1ddda6f7d3537850ffb6818c226152df"
 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-r756.ebuild b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r757.ebuild
similarity index 88%
rename from chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r756.ebuild
rename to chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r757.ebuild
index 14c188e..1feac84 100644
--- a/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r756.ebuild
+++ b/chromeos-base/tast-local-test-runner/tast-local-test-runner-0.0.1-r757.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2ad1b5ed63ac152ca9c5f907c9e093e16b14725a"
-CROS_WORKON_TREE="00cb282746732284a2779c7d4e7dc75c5948f2ec"
+CROS_WORKON_COMMIT="bfa58941f4135385da3fa4eafcb220a691ce381d"
+CROS_WORKON_TREE="d365639c1ddda6f7d3537850ffb6818c226152df"
 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-r3922.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3923.ebuild
similarity index 90%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3922.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3923.ebuild
index b0ba5fc..9214ee5 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3922.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3923.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("94576ec1a210276a6966035bff63f081ad0040d0" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a")
-CROS_WORKON_TREE=("d73579024d8e86769ddc9d8f676fde370d4f5cff" "00cb282746732284a2779c7d4e7dc75c5948f2ec")
+CROS_WORKON_COMMIT=("94576ec1a210276a6966035bff63f081ad0040d0" "bfa58941f4135385da3fa4eafcb220a691ce381d")
+CROS_WORKON_TREE=("d73579024d8e86769ddc9d8f676fde370d4f5cff" "d365639c1ddda6f7d3537850ffb6818c226152df")
 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-r3942.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3943.ebuild
similarity index 85%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3942.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3943.ebuild
index 9f51865..e89840f 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3942.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3943.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("94576ec1a210276a6966035bff63f081ad0040d0" "2ad1b5ed63ac152ca9c5f907c9e093e16b14725a" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
-CROS_WORKON_TREE=("d73579024d8e86769ddc9d8f676fde370d4f5cff" "00cb282746732284a2779c7d4e7dc75c5948f2ec" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
+CROS_WORKON_COMMIT=("94576ec1a210276a6966035bff63f081ad0040d0" "bfa58941f4135385da3fa4eafcb220a691ce381d" "4e80173ac59e4cab9ae07b919c1c367642d4516d")
+CROS_WORKON_TREE=("d73579024d8e86769ddc9d8f676fde370d4f5cff" "d365639c1ddda6f7d3537850ffb6818c226152df" "0ae43237ada86ff051625b38e4bfb48ff0e7da45")
 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-r2053.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r2054.ebuild
similarity index 92%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r2053.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r2054.ebuild
index bf04f92..b1bd6b0 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r2053.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r2054.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="3fafe7ee134e9462d8c9d737ea15a9ae0be2e995"
-CROS_WORKON_TREE="5b997a8b17adebb574824aa4697b80a9e1de81e6"
+CROS_WORKON_COMMIT="ea08436d83146f029bedd71261d4f9c893deb0c3"
+CROS_WORKON_TREE="908e6d9a892a6bcf3d55aa2b095c09132256e34c"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"