diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4039.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4039.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild
index a12ddd5..a018495 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4039.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4040.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("13975210ee624e3cfec2802d83fde06f7834cf2d" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
-CROS_WORKON_TREE=("61f10b24719190bf81e9c6fda3252627b757be1f" "32903f97edbef88a34223ca070e127065ee58332")
+CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
+CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "32903f97edbef88a34223ca070e127065ee58332")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8772.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8772.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild
index b138f17..f51a25c 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8772.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8773.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("13975210ee624e3cfec2802d83fde06f7834cf2d" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("61f10b24719190bf81e9c6fda3252627b757be1f" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r630.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r630.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild
index a88e4c9..0a563f1b 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r630.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r631.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("13975210ee624e3cfec2802d83fde06f7834cf2d" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("61f10b24719190bf81e9c6fda3252627b757be1f" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("397999bf301d88e04d65a9c2c1bbee1c074405a5" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("4367fcaf20c7a6914d19c63c848b74c28138e3be" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6778.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6778.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild
index 546bcce..7fa20b1 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6778.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6779.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="13975210ee624e3cfec2802d83fde06f7834cf2d"
-CROS_WORKON_TREE="61f10b24719190bf81e9c6fda3252627b757be1f"
+CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
+CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
 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-r5882.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5882.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild
index 5cec7e0..a9f0cb5 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5882.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5883.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13975210ee624e3cfec2802d83fde06f7834cf2d"
-CROS_WORKON_TREE="61f10b24719190bf81e9c6fda3252627b757be1f"
+CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
+CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
 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-r8711.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8712.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8711.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8712.ebuild
index 95188d3..35b24f4 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8711.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8712.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="13975210ee624e3cfec2802d83fde06f7834cf2d"
-CROS_WORKON_TREE="61f10b24719190bf81e9c6fda3252627b757be1f"
+CROS_WORKON_COMMIT="397999bf301d88e04d65a9c2c1bbee1c074405a5"
+CROS_WORKON_TREE="4367fcaf20c7a6914d19c63c848b74c28138e3be"
 CROS_WORKON_PROJECT="chromiumos/platform/ec"
 CROS_WORKON_LOCALNAME="platform/ec"
 
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1619.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1620.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1619.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1620.ebuild
index 3ffc16c..ca533647 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1619.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1620.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="9caa3cbbf53975747f7707b4aa4e2c1aa2e4baeb"
-CROS_WORKON_TREE="8daad60c9a88ea914b0fb2c70b98d776a60f4aa3"
+CROS_WORKON_COMMIT="f47025c5606e603d61550e81f18765900f5151f8"
+CROS_WORKON_TREE="311f47bd047c1afbbd2044943cfe5feb57602352"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"