diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4221.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4222.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4221.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4222.ebuild
index f0d682a..a245b90 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4221.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4222.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef" "72a3dd167c24a20a6df568d0c84c77dd45a6d2cf")
-CROS_WORKON_TREE=("11e2d517b8dc1f9c7122882d212a3a744863df02" "1d1c66467f1ce5e5b0117438c1c104b51f954f5d")
+CROS_WORKON_COMMIT=("4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5" "72a3dd167c24a20a6df568d0c84c77dd45a6d2cf")
+CROS_WORKON_TREE=("310699a331ff16553012f23eefaaa7b3b3f8fd6f" "1d1c66467f1ce5e5b0117438c1c104b51f954f5d")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8949.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8950.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8949.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8950.ebuild
index 2a1e6f2..167cb83 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8949.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8950.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("11e2d517b8dc1f9c7122882d212a3a744863df02" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("310699a331ff16553012f23eefaaa7b3b3f8fd6f" "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-r807.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r808.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r807.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r808.ebuild
index b2bbec5..e690c79 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r807.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r808.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
-CROS_WORKON_TREE=("11e2d517b8dc1f9c7122882d212a3a744863df02" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
+CROS_WORKON_COMMIT=("4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5" "3830fffbc5c5205bb8fb1b9f366fe44559923592")
+CROS_WORKON_TREE=("310699a331ff16553012f23eefaaa7b3b3f8fd6f" "f3d026c790bd3d7121bb96ed2a4932360d698a73")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6954.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6955.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6954.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6955.ebuild
index 0406fa5..902064e 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6954.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6955.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef"
-CROS_WORKON_TREE="11e2d517b8dc1f9c7122882d212a3a744863df02"
+CROS_WORKON_COMMIT="4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5"
+CROS_WORKON_TREE="310699a331ff16553012f23eefaaa7b3b3f8fd6f"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 PYTHON_COMPAT=( python2_7 python3_6 )
diff --git a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6058.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6059.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6058.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6059.ebuild
index 62ce3a8..15ac2f0 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6058.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r6059.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef"
-CROS_WORKON_TREE="11e2d517b8dc1f9c7122882d212a3a744863df02"
+CROS_WORKON_COMMIT="4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5"
+CROS_WORKON_TREE="310699a331ff16553012f23eefaaa7b3b3f8fd6f"
 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-r8887.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8888.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8887.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8888.ebuild
index 8316493..0fce6f1 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8887.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8888.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="c4ad6ccf5d64e1af3abbaba257781ff02ee2a7ef"
-CROS_WORKON_TREE="11e2d517b8dc1f9c7122882d212a3a744863df02"
+CROS_WORKON_COMMIT="4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5"
+CROS_WORKON_TREE="310699a331ff16553012f23eefaaa7b3b3f8fd6f"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r26.ebuild b/chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r27.ebuild
similarity index 87%
rename from chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r26.ebuild
rename to chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r27.ebuild
index 116c754..3be180e 100644
--- a/chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r26.ebuild
+++ b/chromeos-base/zephyr-build-tools/zephyr-build-tools-0.0.1-r27.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="6b148b4e6f7f8aac1a9c87585f904724ebb300f8"
-CROS_WORKON_TREE="637ab897e80a9d4c9f264bdd79528990e3eb85db"
+CROS_WORKON_COMMIT="4291b9c59ea5f8e974b7db238d69bebd2d4bb6f5"
+CROS_WORKON_TREE="9829912881abaf97bc4ecd8d68e28612ccf9a31e"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 CROS_WORKON_SUBTREE="zephyr/zmake"