diff --git a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r10.ebuild b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r11.ebuild
similarity index 85%
rename from chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r10.ebuild
rename to chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r11.ebuild
index 28ed181..3382541 100644
--- a/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r10.ebuild
+++ b/chromeos-base/cros_healthd-client/cros_healthd-client-0.0.1-r11.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5bbbe52a139486abcbd802b9bd3f6763dac479b3"
-CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "a4550aa023f8f0898664d08b7d17e3bf9d0dfe32" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="848f8415ddf1841a24faf4deaf6c3d63821b036b"
+CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "b148be42aacbe8dfa2866e84614df1e489fa6b99" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/devserver/devserver-0.0.3-r1125.ebuild b/chromeos-base/devserver/devserver-0.0.3-r1126.ebuild
similarity index 85%
rename from chromeos-base/devserver/devserver-0.0.3-r1125.ebuild
rename to chromeos-base/devserver/devserver-0.0.3-r1126.ebuild
index c69668b..c0fcbac 100644
--- a/chromeos-base/devserver/devserver-0.0.3-r1125.ebuild
+++ b/chromeos-base/devserver/devserver-0.0.3-r1126.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="4c9b0bff59adfa276da2c9daa2b3143ea8b6b09c"
-CROS_WORKON_TREE="d02bd2d710b9a2ab06a9d9746e9b146bb911f1fe"
+CROS_WORKON_COMMIT="c20010434ed180b67b404420979023fe3eb0047b"
+CROS_WORKON_TREE="933f8b3c8f81581b6e7c3375e0577b15913133d4"
 CROS_WORKON_PROJECT="chromiumos/platform/dev-util"
 CROS_WORKON_LOCALNAME="platform/dev"
 CROS_WORKON_OUTOFTREE_BUILD="1"
diff --git a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r743.ebuild b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r744.ebuild
similarity index 83%
rename from chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r743.ebuild
rename to chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r744.ebuild
index 58d4bcb..ca19090 100644
--- a/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r743.ebuild
+++ b/chromeos-base/diagnostics-dpsl-test/diagnostics-dpsl-test-0.0.1-r744.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-CROS_WORKON_COMMIT="5bbbe52a139486abcbd802b9bd3f6763dac479b3"
-CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "780ad5add642ad8d421c7148614e967713ca9bee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="848f8415ddf1841a24faf4deaf6c3d63821b036b"
+CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "5053293c8acdb133cff9f0893424aca79679a148" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/diagnostics/diagnostics-0.0.1-r1105.ebuild b/chromeos-base/diagnostics/diagnostics-0.0.1-r1106.ebuild
similarity index 95%
rename from chromeos-base/diagnostics/diagnostics-0.0.1-r1105.ebuild
rename to chromeos-base/diagnostics/diagnostics-0.0.1-r1106.ebuild
index ae00334..8eb3877 100644
--- a/chromeos-base/diagnostics/diagnostics-0.0.1-r1105.ebuild
+++ b/chromeos-base/diagnostics/diagnostics-0.0.1-r1106.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="5bbbe52a139486abcbd802b9bd3f6763dac479b3"
-CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "3a8b816b9fdaca04ec76e8a8d97b206e139a9dfc" "780ad5add642ad8d421c7148614e967713ca9bee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="848f8415ddf1841a24faf4deaf6c3d63821b036b"
+CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "3a8b816b9fdaca04ec76e8a8d97b206e139a9dfc" "5053293c8acdb133cff9f0893424aca79679a148" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/update_engine/update_engine-0.0.3-r3837.ebuild b/chromeos-base/update_engine/update_engine-0.0.3-r3838.ebuild
similarity index 95%
rename from chromeos-base/update_engine/update_engine-0.0.3-r3837.ebuild
rename to chromeos-base/update_engine/update_engine-0.0.3-r3838.ebuild
index 734a124..8574447 100644
--- a/chromeos-base/update_engine/update_engine-0.0.3-r3837.ebuild
+++ b/chromeos-base/update_engine/update_engine-0.0.3-r3838.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("5bbbe52a139486abcbd802b9bd3f6763dac479b3" "94ee44fd93035743b6204aefff1f4099b53cbdbd")
-CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "780ad5add642ad8d421c7148614e967713ca9bee" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e8f154e1827adae22511d24dad70a3a206d5ba27")
+CROS_WORKON_COMMIT=("848f8415ddf1841a24faf4deaf6c3d63821b036b" "94ee44fd93035743b6204aefff1f4099b53cbdbd")
+CROS_WORKON_TREE=("ef118ceb3e8ebcc8b8a4ae6577a71d7ad210a722" "5053293c8acdb133cff9f0893424aca79679a148" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "e8f154e1827adae22511d24dad70a3a206d5ba27")
 CROS_WORKON_LOCALNAME=("platform2" "aosp/system/update_engine")
 CROS_WORKON_PROJECT=("chromiumos/platform2" "aosp/platform/system/update_engine")
 CROS_WORKON_EGIT_BRANCH=("main" "master")