diff --git a/chromeos-base/iioservice/iioservice-0.0.1-r1.ebuild b/chromeos-base/iioservice/iioservice-0.0.1-r2.ebuild
similarity index 83%
rename from chromeos-base/iioservice/iioservice-0.0.1-r1.ebuild
rename to chromeos-base/iioservice/iioservice-0.0.1-r2.ebuild
index 601f00c..8ce5c01 100644
--- a/chromeos-base/iioservice/iioservice-0.0.1-r1.ebuild
+++ b/chromeos-base/iioservice/iioservice-0.0.1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="ef3616f80d427851007539fb3b46221b634e1bfc"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "1c8af557171e05a7a6879db996f8acc73acf390f" "8f35e119f25ef305beccfd5c0adf0236354fbe08" "cf397e9600a0b2d153f579c58419577cfca75ab7")
+CROS_WORKON_COMMIT="9a389f782e9744467f43bf04eade816cf6806a0e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7519c62af769f5956ef35b7f17ad128761c0e5ea" "8f35e119f25ef305beccfd5c0adf0236354fbe08" "cf397e9600a0b2d153f579c58419577cfca75ab7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 # TODO(crbug.com/809389): Remove libmems from this list.
diff --git a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r7.ebuild b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r8.ebuild
similarity index 77%
rename from chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r7.ebuild
rename to chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r8.ebuild
index 4a538dd..4e60272 100644
--- a/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r7.ebuild
+++ b/chromeos-base/libiioservice_ipc/libiioservice_ipc-0.0.1-r8.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="ef3616f80d427851007539fb3b46221b634e1bfc"
-CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "1c8af557171e05a7a6879db996f8acc73acf390f" "cf397e9600a0b2d153f579c58419577cfca75ab7")
+CROS_WORKON_COMMIT="9a389f782e9744467f43bf04eade816cf6806a0e"
+CROS_WORKON_TREE=("e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb" "7519c62af769f5956ef35b7f17ad128761c0e5ea" "cf397e9600a0b2d153f579c58419577cfca75ab7")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_SUBTREE=".gn iioservice common-mk"
diff --git a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1430.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1431.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1430.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1431.ebuild
index f5268c3..6708177 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1430.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1431.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="01331f1be837721a3a93aadadf4a207b4d22ec23"
-CROS_WORKON_TREE="f398e0399118384018f56a3fc7b9e83182a91901"
+CROS_WORKON_COMMIT="9a389f782e9744467f43bf04eade816cf6806a0e"
+CROS_WORKON_TREE="d0c9079bb86b33821bb3e88a4b1ff05555a76003"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"