diff --git a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3313.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3314.ebuild
similarity index 95%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3313.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3314.ebuild
index e10ecdc..a66943c 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3313.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3314.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33cf4d2ed71bccbc0fa9869804c43c99f3cf9af1"
-CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "197046ff3b04ce2b8d6a73c415ec3b924bccdc44" "7e189936f29d145c4191ea147e48256c92fac75d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
+CROS_WORKON_COMMIT="2bbc64c649ca678eb435872543eecdbef663c46b"
+CROS_WORKON_TREE=("b1c6245dddc7b5e10da108b13f7c3883aa0b6c2c" "f1b1032796bfc8f870fc727f6895558451675b4e" "7e189936f29d145c4191ea147e48256c92fac75d" "e7dba8c91c1f3257c34d4a7ffff0ea2537aeb6bb")
 CROS_WORKON_INCREMENTAL_BUILD=1
 CROS_WORKON_LOCALNAME="platform2"
 CROS_WORKON_PROJECT="chromiumos/platform2"
diff --git a/chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r47.ebuild b/chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r48.ebuild
similarity index 88%
rename from chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r47.ebuild
rename to chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r48.ebuild
index e1306b8..555a8a4 100644
--- a/chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r47.ebuild
+++ b/chromeos-base/tast-local-apks-cros/tast-local-apks-cros-0.0.1-r48.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-CROS_WORKON_COMMIT="63f0137f5c47a73285f502b788b037c7234e69b0"
-CROS_WORKON_TREE="4c30ab9ef08ff4062a521aab9801d146a40cd9e4"
+CROS_WORKON_COMMIT="7d6248dee2c12b70226aa0dfa734c08dad77ccf2"
+CROS_WORKON_TREE="0456cba5d76856da5607ce1fb91d67346a6dea02"
 CROS_WORKON_PROJECT="chromiumos/platform/tast-tests"
 CROS_WORKON_LOCALNAME="platform/tast-tests"
 CROS_WORKON_SUBTREE="android"
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3188.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3189.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3188.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3189.ebuild
index 828f054..8e7128f 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3188.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r3189.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("eb35ab092e51491ebca93e295f7c9b8bde484d7b" "7882f73dac265b4c5eb48a84c7c2201ff7012eed")
-CROS_WORKON_TREE=("0f08759a3ac61f596824c8b4ad016a445d73aec2" "4a8db68dcd87e8909453f8880c06431869d2dbeb")
+CROS_WORKON_COMMIT=("7d6248dee2c12b70226aa0dfa734c08dad77ccf2" "7882f73dac265b4c5eb48a84c7c2201ff7012eed")
+CROS_WORKON_TREE=("27762647886f2a5aec0aea572ee92703532ca9df" "4a8db68dcd87e8909453f8880c06431869d2dbeb")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3195.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3196.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3195.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3196.ebuild
index 1ec4f26..34ada72 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3195.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r3196.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("eb35ab092e51491ebca93e295f7c9b8bde484d7b" "7882f73dac265b4c5eb48a84c7c2201ff7012eed" "c5889adab57bc6394a900a60d6f943f7918fef8d")
-CROS_WORKON_TREE=("0f08759a3ac61f596824c8b4ad016a445d73aec2" "4a8db68dcd87e8909453f8880c06431869d2dbeb" "dd84017ea39c62ab8790679abd24e7d37367ac48")
+CROS_WORKON_COMMIT=("7d6248dee2c12b70226aa0dfa734c08dad77ccf2" "7882f73dac265b4c5eb48a84c7c2201ff7012eed" "c5889adab57bc6394a900a60d6f943f7918fef8d")
+CROS_WORKON_TREE=("27762647886f2a5aec0aea572ee92703532ca9df" "4a8db68dcd87e8909453f8880c06431869d2dbeb" "dd84017ea39c62ab8790679abd24e7d37367ac48")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"
diff --git a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1171.ebuild b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1172.ebuild
similarity index 91%
rename from media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1171.ebuild
rename to media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1172.ebuild
index cca6a8c..b712cd2 100644
--- a/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1171.ebuild
+++ b/media-libs/cros-camera-hal-intel-ipu6-squash/cros-camera-hal-intel-ipu6-squash-0.0.1-r1172.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="33cf4d2ed71bccbc0fa9869804c43c99f3cf9af1"
-CROS_WORKON_TREE="c43bb73190a772d921a9950ebabbf2fbb8d684c7"
+CROS_WORKON_COMMIT="2bbc64c649ca678eb435872543eecdbef663c46b"
+CROS_WORKON_TREE="f54e14e0ebc342d56843d8c2bac6cc5678156073"
 CROS_WORKON_PROJECT="chromiumos/platform2"
 CROS_WORKON_LOCALNAME="../platform2"
 CROS_WORKON_DESTDIR="${S}/platform2"
diff --git a/net-wireless/hostap-test/hostap-test-0.0.1-r16.ebuild b/net-wireless/hostap-test/hostap-test-0.0.1-r17.ebuild
similarity index 95%
rename from net-wireless/hostap-test/hostap-test-0.0.1-r16.ebuild
rename to net-wireless/hostap-test/hostap-test-0.0.1-r17.ebuild
index 3b50bae..3b17d2c 100644
--- a/net-wireless/hostap-test/hostap-test-0.0.1-r16.ebuild
+++ b/net-wireless/hostap-test/hostap-test-0.0.1-r17.ebuild
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 EAPI="7"
-CROS_WORKON_COMMIT="7b5cdbe2205ef23907e0cf30867013a5c8d0dffb"
-CROS_WORKON_TREE="be67916bc5a7eb2be0cc55683e3d5c4c06f32cfe"
+CROS_WORKON_COMMIT="4a2e80621ebf749fdc23f3a33c217a65d8728b60"
+CROS_WORKON_TREE="8f4e7dd1cabaf47a54e000e1fe96ff68f5cec9df"
 CROS_WORKON_PROJECT="chromiumos/third_party/hostap"
 CROS_WORKON_LOCALNAME="../third_party/wpa_supplicant-2.9"
 
diff --git a/net-wireless/hostapd/hostapd-2.9-r138.ebuild b/net-wireless/hostapd/hostapd-2.9-r139.ebuild
similarity index 97%
rename from net-wireless/hostapd/hostapd-2.9-r138.ebuild
rename to net-wireless/hostapd/hostapd-2.9-r139.ebuild
index ab1b442..dc628c4 100644
--- a/net-wireless/hostapd/hostapd-2.9-r138.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r139.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-CROS_WORKON_COMMIT="7b5cdbe2205ef23907e0cf30867013a5c8d0dffb"
-CROS_WORKON_TREE="be67916bc5a7eb2be0cc55683e3d5c4c06f32cfe"
+CROS_WORKON_COMMIT="4a2e80621ebf749fdc23f3a33c217a65d8728b60"
+CROS_WORKON_TREE="8f4e7dd1cabaf47a54e000e1fe96ff68f5cec9df"
 CROS_WORKON_PROJECT="chromiumos/third_party/hostap"
 CROS_WORKON_LOCALNAME="../third_party/wpa_supplicant-2.9"
 
diff --git a/net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r1.ebuild b/net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r2.ebuild
similarity index 98%
rename from net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r1.ebuild
rename to net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r2.ebuild
index 73decb5..6717f1c 100644
--- a/net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant-2_9/wpa_supplicant-2_9-2.9-r2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="7b5cdbe2205ef23907e0cf30867013a5c8d0dffb"
-CROS_WORKON_TREE="be67916bc5a7eb2be0cc55683e3d5c4c06f32cfe"
+CROS_WORKON_COMMIT="4a2e80621ebf749fdc23f3a33c217a65d8728b60"
+CROS_WORKON_TREE="8f4e7dd1cabaf47a54e000e1fe96ff68f5cec9df"
 CROS_WORKON_PROJECT="chromiumos/third_party/hostap"
 CROS_WORKON_LOCALNAME="../third_party/wpa_supplicant-2.9"
 CROS_WORKON_EGIT_BRANCH="wpa_supplicant-2.9"
diff --git a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r822.ebuild b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r823.ebuild
similarity index 88%
rename from sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r822.ebuild
rename to sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r823.ebuild
index b11a0d9..7dca5f9 100644
--- a/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r822.ebuild
+++ b/sys-kernel/chromeos-kernel-5_4/chromeos-kernel-5_4-5.4.50-r823.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-CROS_WORKON_COMMIT="dd3f09cf08d211ccc2987d865b5c6ddaa5a5e489"
-CROS_WORKON_TREE="9add2832f93f55aaf29bc2320c4acd8b0a40b32d"
+CROS_WORKON_COMMIT="f5eb44b815b6785a36548d664cf8a8750b1c497b"
+CROS_WORKON_TREE="1615cc5fdcbfa568567cb88aa92b0dbeb67a4779"
 CROS_WORKON_PROJECT="chromiumos/third_party/kernel"
 CROS_WORKON_LOCALNAME="kernel/v5.4"
 CROS_WORKON_EGIT_BRANCH="chromeos-5.4"