diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9189.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9190.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9189.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9190.ebuild
index 3d55aca..21b751c 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9189.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r9190.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ed26c6d50c11858705949dc545fa4a8abf850976" "caf0666a392c3601ec79e324d52187e17abbae61")
-CROS_WORKON_TREE=("89b634d7ddfce75e844f1ac4e307803caea8cf0a" "3160ba00fb2574cb4a584b5da95c782200a542e1")
+CROS_WORKON_COMMIT=("00f0f23d0e9598841304385964353716c8d5b729" "caf0666a392c3601ec79e324d52187e17abbae61")
+CROS_WORKON_TREE=("96fda1abe684869c0da77cdc3ea3b84bbe648604" "3160ba00fb2574cb4a584b5da95c782200a542e1")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13752.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13753.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13752.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13753.ebuild
index db5fcff..997edbc 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13752.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r13753.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ed26c6d50c11858705949dc545fa4a8abf850976" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
-CROS_WORKON_TREE=("89b634d7ddfce75e844f1ac4e307803caea8cf0a" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
+CROS_WORKON_COMMIT=("00f0f23d0e9598841304385964353716c8d5b729" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
+CROS_WORKON_TREE=("96fda1abe684869c0da77cdc3ea3b84bbe648604" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5610.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5611.ebuild
similarity index 93%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5610.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5611.ebuild
index 55b2afb..f140c52 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5610.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r5611.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("ed26c6d50c11858705949dc545fa4a8abf850976" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
-CROS_WORKON_TREE=("89b634d7ddfce75e844f1ac4e307803caea8cf0a" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
+CROS_WORKON_COMMIT=("00f0f23d0e9598841304385964353716c8d5b729" "11a97df4133f905bbdf9ddb48b5d56d617ec949b")
+CROS_WORKON_TREE=("96fda1abe684869c0da77cdc3ea3b84bbe648604" "cafc71cae4ef6b3e7e64648b257b3f0ca2300e1d")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4480.ebuild b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4481.ebuild
similarity index 94%
rename from chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4480.ebuild
rename to chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4481.ebuild
index f119335..ebf0154 100644
--- a/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4480.ebuild
+++ b/chromeos-base/chromeos-zephyr/chromeos-zephyr-0.0.1-r4481.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("a19f3972a473612a6a6c87a86ee3cdd2cec141a6" "45216bc4be443ec7c48a26cd958cb1a951564dec" "74a5a2025e40b599ffc71a68efd3444b0daf30a9" "0cdcea9140d23ce6f739850f93dcf3a2f4f6e4d4" "ed26c6d50c11858705949dc545fa4a8abf850976")
-CROS_WORKON_TREE=("dbf3163517e5392a233b387ea01d83bbe612f879" "27307ed38fd548a34915387bf3477456118b7e2a" "fa09b2c5e1b0265e807e3348cf0c7a8caf850bb0" "b7cd5b19f195084b4849c677b63f4e4288042998" "89b634d7ddfce75e844f1ac4e307803caea8cf0a")
+CROS_WORKON_COMMIT=("a19f3972a473612a6a6c87a86ee3cdd2cec141a6" "45216bc4be443ec7c48a26cd958cb1a951564dec" "74a5a2025e40b599ffc71a68efd3444b0daf30a9" "0cdcea9140d23ce6f739850f93dcf3a2f4f6e4d4" "00f0f23d0e9598841304385964353716c8d5b729")
+CROS_WORKON_TREE=("dbf3163517e5392a233b387ea01d83bbe612f879" "27307ed38fd548a34915387bf3477456118b7e2a" "fa09b2c5e1b0265e807e3348cf0c7a8caf850bb0" "b7cd5b19f195084b4849c677b63f4e4288042998" "96fda1abe684869c0da77cdc3ea3b84bbe648604")
 CROS_WORKON_USE_VCSID=1
 CROS_WORKON_PROJECT=(
 	"chromiumos/third_party/zephyr"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11757.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11758.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r11757.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r11758.ebuild
index 4207fd8..8d201b9 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11757.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r11758.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="ed26c6d50c11858705949dc545fa4a8abf850976"
-CROS_WORKON_TREE="89b634d7ddfce75e844f1ac4e307803caea8cf0a"
+CROS_WORKON_COMMIT="00f0f23d0e9598841304385964353716c8d5b729"
+CROS_WORKON_TREE="96fda1abe684869c0da77cdc3ea3b84bbe648604"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python3_{6..9} )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10862.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10863.ebuild
similarity index 89%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10862.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10863.ebuild
index 3e9ff0c..0fd722f 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10862.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r10863.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ed26c6d50c11858705949dc545fa4a8abf850976"
-CROS_WORKON_TREE="89b634d7ddfce75e844f1ac4e307803caea8cf0a"
+CROS_WORKON_COMMIT="00f0f23d0e9598841304385964353716c8d5b729"
+CROS_WORKON_TREE="96fda1abe684869c0da77cdc3ea3b84bbe648604"
 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-r13690.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r13691.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r13690.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r13691.ebuild
index 0859056..6915f0a 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r13690.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r13691.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="ed26c6d50c11858705949dc545fa4a8abf850976"
-CROS_WORKON_TREE="89b634d7ddfce75e844f1ac4e307803caea8cf0a"
+CROS_WORKON_COMMIT="00f0f23d0e9598841304385964353716c8d5b729"
+CROS_WORKON_TREE="96fda1abe684869c0da77cdc3ea3b84bbe648604"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1358.ebuild b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1359.ebuild
similarity index 91%
rename from chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1358.ebuild
rename to chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1359.ebuild
index a33fbd9..812dae4 100644
--- a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1358.ebuild
+++ b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r1359.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("0579eaa8097283074c99600c84de8d506683465e" "a7cb708137eaaf7c171f2022c39fd6ede143c80c")
-CROS_WORKON_TREE=("efc9d7208bf0ffc87de181aca5f5ed6b14a27b2f" "6202ae09ece9e10daed4b26eb8452605eba8e6ab" "5328e03abfd1af165a3a26805d1ff6b213a3ca48" "5357959697d54dd9c8e53a000353e66576c0f499" "047aec16e03eb36312cc201dc75d33e25ece833d")
+CROS_WORKON_COMMIT=("0579eaa8097283074c99600c84de8d506683465e" "58286d629b31dfe7d41f50f7b7d4be22b05c0dec")
+CROS_WORKON_TREE=("efc9d7208bf0ffc87de181aca5f5ed6b14a27b2f" "6202ae09ece9e10daed4b26eb8452605eba8e6ab" "5328e03abfd1af165a3a26805d1ff6b213a3ca48" "28e022f9ce27e2e0075d8f726856c964d4460dd8" "047aec16e03eb36312cc201dc75d33e25ece833d")
 CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/chromite")
 CROS_WORKON_LOCALNAME=("platform/factory" "../chromite")
 CROS_WORKON_SUBTREE=("py" "lib bin scripts PRESUBMIT.cfg")
diff --git a/sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r416.ebuild b/sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r417.ebuild
similarity index 83%
rename from sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r416.ebuild
rename to sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r417.ebuild
index f9df9b9..81b3534 100644
--- a/sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r416.ebuild
+++ b/sys-firmware/ap-firmware-config/ap-firmware-config-0.0.1-r417.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33de68f98c03a5b9a84258382ec4b4c92bb285d4"
-CROS_WORKON_TREE=("6202ae09ece9e10daed4b26eb8452605eba8e6ab" "5328e03abfd1af165a3a26805d1ff6b213a3ca48" "5357959697d54dd9c8e53a000353e66576c0f499" "047aec16e03eb36312cc201dc75d33e25ece833d")
+CROS_WORKON_COMMIT="58286d629b31dfe7d41f50f7b7d4be22b05c0dec"
+CROS_WORKON_TREE=("6202ae09ece9e10daed4b26eb8452605eba8e6ab" "5328e03abfd1af165a3a26805d1ff6b213a3ca48" "28e022f9ce27e2e0075d8f726856c964d4460dd8" "047aec16e03eb36312cc201dc75d33e25ece833d")
 PYTHON_COMPAT=( python3_{6..9} )
 
 CROS_WORKON_LOCALNAME="../../chromite"