diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5520.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5520.ebuild
index 76ae920..0c7c0d2 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5520.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "a6e62a3020e1f6d53880d91760073c4f91a63bef")
-CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "4e79f17b97acb8477a0a826b049cb5bfecb4ac70")
+CROS_WORKON_COMMIT=("07578aee1c0c64343ee0de7e186a708984552904" "a6e62a3020e1f6d53880d91760073c4f91a63bef")
+CROS_WORKON_TREE=("a934d4b3f61377831a50d8ac72645257ca341e85" "4e79f17b97acb8477a0a826b049cb5bfecb4ac70")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10227.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10227.ebuild
index 20967cc..ae9a614 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10227.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("07578aee1c0c64343ee0de7e186a708984552904" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("a934d4b3f61377831a50d8ac72645257ca341e85" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2084.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2084.ebuild
index 5756ad2..454e31e 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2084.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("07578aee1c0c64343ee0de7e186a708984552904" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("a934d4b3f61377831a50d8ac72645257ca341e85" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r700.ebuild
similarity index 94%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r700.ebuild
index 50c402a..b9238eb 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r700.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f")
-CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "05f2cb91630eb58a13d92152d0a74646fae473e7")
+CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "07578aee1c0c64343ee0de7e186a708984552904")
+CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "a934d4b3f61377831a50d8ac72645257ca341e85")
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8232.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r8232.ebuild
index cdf1105..e5a1739 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8232.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
-CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
+CROS_WORKON_COMMIT="07578aee1c0c64343ee0de7e186a708984552904"
+CROS_WORKON_TREE="a934d4b3f61377831a50d8ac72645257ca341e85"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7336.ebuild
similarity index 88%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7336.ebuild
index 9d04632..d30c9d8 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7336.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
-CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
+CROS_WORKON_COMMIT="07578aee1c0c64343ee0de7e186a708984552904"
+CROS_WORKON_TREE="a934d4b3f61377831a50d8ac72645257ca341e85"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r10166.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r10166.ebuild
index 97b80b6..edba691 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r10166.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
-CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
+CROS_WORKON_COMMIT="07578aee1c0c64343ee0de7e186a708984552904"
+CROS_WORKON_TREE="a934d4b3f61377831a50d8ac72645257ca341e85"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6648.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6649.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6648.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6649.ebuild
index 5e9b224..9912a4e 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6648.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6649.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("e0bda9124d13e798932c5d4f1c50fdd5fb14a888" "4527403fcdf7416eae625fa39718b6c8f9842987")
-CROS_WORKON_TREE=("64c996c8f82d5e2aebfb468fe16f8e663fc1ea52" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4")
+CROS_WORKON_COMMIT=("32ea530fb1d5f9a96e4bc9b6f1626a12ec9bcb60" "4527403fcdf7416eae625fa39718b6c8f9842987")
+CROS_WORKON_TREE=("fc6b4cee6a9a1b0976b7f94ffbd6e917f0e7fef6" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4")
 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-r6697.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6698.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6697.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6698.ebuild
index 666e7da..d938a93 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6697.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6698.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("e0bda9124d13e798932c5d4f1c50fdd5fb14a888" "4527403fcdf7416eae625fa39718b6c8f9842987" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
-CROS_WORKON_TREE=("64c996c8f82d5e2aebfb468fe16f8e663fc1ea52" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
+CROS_WORKON_COMMIT=("32ea530fb1d5f9a96e4bc9b6f1626a12ec9bcb60" "4527403fcdf7416eae625fa39718b6c8f9842987" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
+CROS_WORKON_TREE=("fc6b4cee6a9a1b0976b7f94ffbd6e917f0e7fef6" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r300.ebuild b/sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r301.ebuild
similarity index 96%
rename from sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r300.ebuild
rename to sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r301.ebuild
index c19aad4..c640e87 100644
--- a/sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r300.ebuild
+++ b/sys-boot/chromeos-bmpblk/chromeos-bmpblk-1.0.1-r301.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="f90b6a47d0361500f7307f969915d1fe5e65082e"
-CROS_WORKON_TREE="7413e58c255c4b21b6a957cf7f9a694e72d03dea"
+CROS_WORKON_COMMIT="720e73efd70668f3d3e5d77d22e9678026076a2b"
+CROS_WORKON_TREE="adc125e63a2cf7b47603a336a8390afa9374aede"
 CROS_WORKON_PROJECT="chromiumos/platform/bmpblk"
 CROS_WORKON_LOCALNAME="../platform/bmpblk"
 CROS_WORKON_OUTOFTREE_BUILD="1"