diff --git a/chromeos-base/autotest/autotest-0.0.2-r14333.ebuild b/chromeos-base/autotest/autotest-0.0.2-r14334.ebuild
similarity index 95%
rename from chromeos-base/autotest/autotest-0.0.2-r14333.ebuild
rename to chromeos-base/autotest/autotest-0.0.2-r14334.ebuild
index d63ca74..9860674 100644
--- a/chromeos-base/autotest/autotest-0.0.2-r14333.ebuild
+++ b/chromeos-base/autotest/autotest-0.0.2-r14334.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("418c84327915fc6e63a56eafe805d038d4eadc6e" "bb8eec2db8f44e894f23349686b6eef38bbad837")
-CROS_WORKON_TREE=("40d3cbbe8ab31f7f12cccbb4ffef043bc9eb40d1" "0d83a3e9add33f945dded638bf41797b945b1dd1")
+CROS_WORKON_COMMIT=("418c84327915fc6e63a56eafe805d038d4eadc6e" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
+CROS_WORKON_TREE=("40d3cbbe8ab31f7f12cccbb4ffef043bc9eb40d1" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/autotest"
 	"chromiumos/platform/fw-testing-configs"
diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5518.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5518.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild
index 908a7b0..76ae920 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5518.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r5519.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2ffc903ae4c772f2b12897634e24fa8e0c1791ef" "a6e62a3020e1f6d53880d91760073c4f91a63bef")
-CROS_WORKON_TREE=("10052eb0fdf70943ff0b36279d5b90288341ce9a" "4e79f17b97acb8477a0a826b049cb5bfecb4ac70")
+CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "a6e62a3020e1f6d53880d91760073c4f91a63bef")
+CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "4e79f17b97acb8477a0a826b049cb5bfecb4ac70")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10225.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10225.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild
index b39c292..20967cc 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10225.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r10226.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2ffc903ae4c772f2b12897634e24fa8e0c1791ef" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("10052eb0fdf70943ff0b36279d5b90288341ce9a" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "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-r2082.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2082.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild
index e657134..5756ad2 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2082.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r2083.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("2ffc903ae4c772f2b12897634e24fa8e0c1791ef" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("10052eb0fdf70943ff0b36279d5b90288341ce9a" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("05f2cb91630eb58a13d92152d0a74646fae473e7" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r698.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild
similarity index 94%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r698.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild
index 8810bfe..50c402a 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r698.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r699.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "2ffc903ae4c772f2b12897634e24fa8e0c1791ef")
-CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "10052eb0fdf70943ff0b36279d5b90288341ce9a")
+CROS_WORKON_COMMIT=("1343ad59f05dd3fa6551d339aae7b4e7f13bb030" "c3bd2094f92d574377f7af2aec147ae181aa5f8e" "8eb12e4466cc73f2a95292073832878814b8ed31" "fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f")
+CROS_WORKON_TREE=("060f5aa8b2726d17e2d12f764587a6a3ab7eeb81" "781df7da13c4275a2328c09e75fd937991d80e29" "049362d45a6362cbdede3ebd10c38ed8d446410a" "05f2cb91630eb58a13d92152d0a74646fae473e7")
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8230.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r8230.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild
index 05a1fe8..cdf1105 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8230.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r8231.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="2ffc903ae4c772f2b12897634e24fa8e0c1791ef"
-CROS_WORKON_TREE="10052eb0fdf70943ff0b36279d5b90288341ce9a"
+CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
+CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
 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-r7334.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild
similarity index 88%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7334.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild
index 9ce0b31..9d04632 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7334.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r7335.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2ffc903ae4c772f2b12897634e24fa8e0c1791ef"
-CROS_WORKON_TREE="10052eb0fdf70943ff0b36279d5b90288341ce9a"
+CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
+CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
 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-r10164.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r10164.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild
index 44b5585..97b80b6 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r10164.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r10165.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="2ffc903ae4c772f2b12897634e24fa8e0c1791ef"
-CROS_WORKON_TREE="10052eb0fdf70943ff0b36279d5b90288341ce9a"
+CROS_WORKON_COMMIT="fae6584f0af2eeb4c34e04db6d7ab4aa1e0b6f6f"
+CROS_WORKON_TREE="05f2cb91630eb58a13d92152d0a74646fae473e7"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6696.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6697.ebuild
similarity index 87%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6696.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6697.ebuild
index 037eb8b..666e7da 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6696.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6697.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("e0bda9124d13e798932c5d4f1c50fdd5fb14a888" "4527403fcdf7416eae625fa39718b6c8f9842987" "bb8eec2db8f44e894f23349686b6eef38bbad837")
-CROS_WORKON_TREE=("64c996c8f82d5e2aebfb468fe16f8e663fc1ea52" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4" "0d83a3e9add33f945dded638bf41797b945b1dd1")
+CROS_WORKON_COMMIT=("e0bda9124d13e798932c5d4f1c50fdd5fb14a888" "4527403fcdf7416eae625fa39718b6c8f9842987" "5f6c478c91aecfaf1faeeb2b323cd9373c15b8c0")
+CROS_WORKON_TREE=("64c996c8f82d5e2aebfb468fe16f8e663fc1ea52" "7c60117e575ed6b6cc1bf3e5c39ca9b1577253a4" "5b390379d82b5c1363b3f22283b26f39a1500a7a")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"