diff --git a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4028.ebuild b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4029.ebuild
similarity index 90%
rename from chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4028.ebuild
rename to chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4029.ebuild
index c43357a..963d400 100644
--- a/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4028.ebuild
+++ b/chromeos-base/chromeos-ec-headers/chromeos-ec-headers-0.0.1-r4029.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("49a18c25f8351d232a0065c67297a954caee8414" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
-CROS_WORKON_TREE=("575270e3791566748b54f2234e357b85d415405b" "32903f97edbef88a34223ca070e127065ee58332")
+CROS_WORKON_COMMIT=("5316af00b3389dd9f1da04ce2c9bfe0a504e2d91" "bb7439ef0cc49f052239cc89e34e50e08d32241c")
+CROS_WORKON_TREE=("821058f22b78f882dc28dc3f00578e75155846a8" "32903f97edbef88a34223ca070e127065ee58332")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/platform/ec"
diff --git a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8761.ebuild b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8762.ebuild
similarity index 91%
rename from chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8761.ebuild
rename to chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8762.ebuild
index c8221a9..e23857a 100644
--- a/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8761.ebuild
+++ b/chromeos-base/chromeos-ec/chromeos-ec-0.0.2-r8762.ebuild
@@ -17,8 +17,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("49a18c25f8351d232a0065c67297a954caee8414" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("575270e3791566748b54f2234e357b85d415405b" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("5316af00b3389dd9f1da04ce2c9bfe0a504e2d91" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("821058f22b78f882dc28dc3f00578e75155846a8" "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-r619.ebuild b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r620.ebuild
similarity index 92%
rename from chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r619.ebuild
rename to chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r620.ebuild
index 0f28825..37abcf5 100644
--- a/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r619.ebuild
+++ b/chromeos-base/chromeos-fpmcu-unittests/chromeos-fpmcu-unittests-0.0.1-r620.ebuild
@@ -9,8 +9,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT=("49a18c25f8351d232a0065c67297a954caee8414" "3c5ce9a1c631043476c0f52bad47f241680cc053")
-CROS_WORKON_TREE=("575270e3791566748b54f2234e357b85d415405b" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
+CROS_WORKON_COMMIT=("5316af00b3389dd9f1da04ce2c9bfe0a504e2d91" "3c5ce9a1c631043476c0f52bad47f241680cc053")
+CROS_WORKON_TREE=("821058f22b78f882dc28dc3f00578e75155846a8" "86f00f9caaf3655e9dd1cc01c05ac4662fa3dae5")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/ec"
 	"chromiumos/third_party/cryptoc"
diff --git a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3440.ebuild b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3441.ebuild
similarity index 92%
rename from chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3440.ebuild
rename to chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3441.ebuild
index 6d9f575..2b43f81 100644
--- a/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3440.ebuild
+++ b/chromeos-base/chromeos-installer/chromeos-installer-0.0.3-r3441.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-CROS_WORKON_COMMIT="51a4cfa94c4d9755d787cdf97e11a83d0fd5e48e"
-CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a058825ac2b307faa2e707957e70f720ffbc8bf6" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="a151c4fe59c6f0457ddd350a0c675a0f90a9e038"
+CROS_WORKON_TREE=("c9de2eb52379383658eaf7cbc29fdb5d8d32eb98" "a862c9a8f710bf1b2eb80a10f60f0486658693b8" "2b6d4230c92e83e39209823855064483eed04754" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_INCREMENTAL_BUILD=1
diff --git a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6767.ebuild b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6768.ebuild
similarity index 94%
rename from chromeos-base/ec-devutils/ec-devutils-0.0.2-r6767.ebuild
rename to chromeos-base/ec-devutils/ec-devutils-0.0.2-r6768.ebuild
index 613a31b..31fb43d 100644
--- a/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6767.ebuild
+++ b/chromeos-base/ec-devutils/ec-devutils-0.0.2-r6768.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-CROS_WORKON_COMMIT="49a18c25f8351d232a0065c67297a954caee8414"
-CROS_WORKON_TREE="575270e3791566748b54f2234e357b85d415405b"
+CROS_WORKON_COMMIT="5316af00b3389dd9f1da04ce2c9bfe0a504e2d91"
+CROS_WORKON_TREE="821058f22b78f882dc28dc3f00578e75155846a8"
 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-r5871.ebuild b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5872.ebuild
similarity index 87%
rename from chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5871.ebuild
rename to chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5872.ebuild
index 6659993..5b37bd6 100644
--- a/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5871.ebuild
+++ b/chromeos-base/ec-utils-test/ec-utils-test-0.0.1-r5872.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="49a18c25f8351d232a0065c67297a954caee8414"
-CROS_WORKON_TREE="575270e3791566748b54f2234e357b85d415405b"
+CROS_WORKON_COMMIT="5316af00b3389dd9f1da04ce2c9bfe0a504e2d91"
+CROS_WORKON_TREE="821058f22b78f882dc28dc3f00578e75155846a8"
 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-r8700.ebuild b/chromeos-base/ec-utils/ec-utils-0.0.2-r8701.ebuild
similarity index 93%
rename from chromeos-base/ec-utils/ec-utils-0.0.2-r8700.ebuild
rename to chromeos-base/ec-utils/ec-utils-0.0.2-r8701.ebuild
index b33103c..9e0cb34 100644
--- a/chromeos-base/ec-utils/ec-utils-0.0.2-r8700.ebuild
+++ b/chromeos-base/ec-utils/ec-utils-0.0.2-r8701.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="49a18c25f8351d232a0065c67297a954caee8414"
-CROS_WORKON_TREE="575270e3791566748b54f2234e357b85d415405b"
+CROS_WORKON_COMMIT="5316af00b3389dd9f1da04ce2c9bfe0a504e2d91"
+CROS_WORKON_TREE="821058f22b78f882dc28dc3f00578e75155846a8"
 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-r1613.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1614.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1613.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1614.ebuild
index f4e59af..868d487 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1613.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.83-r1614.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="cc8601bd8ecf0a091de27458bf6f1d62c71f928b"
-CROS_WORKON_TREE="5dbaae13907d176309a6ccfc8684b5a57534037c"
+CROS_WORKON_COMMIT="797eaa95330e411c7554512e3fb4cf1f0c51d2ef"
+CROS_WORKON_TREE="c48a92fa1587858588df194df9e6d0c2056410b1"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"