diff --git a/chromeos-base/factory-mini/factory-mini-0.0.1-r2183.ebuild b/chromeos-base/factory-mini/factory-mini-0.0.1-r2184.ebuild
similarity index 95%
rename from chromeos-base/factory-mini/factory-mini-0.0.1-r2183.ebuild
rename to chromeos-base/factory-mini/factory-mini-0.0.1-r2184.ebuild
index 64e5857..97019de 100644
--- a/chromeos-base/factory-mini/factory-mini-0.0.1-r2183.ebuild
+++ b/chromeos-base/factory-mini/factory-mini-0.0.1-r2184.ebuild
@@ -15,8 +15,8 @@
 # from /usr/local/bin to that file.
 
 EAPI=7
-CROS_WORKON_COMMIT="81dd5615011f9417f91d41669acec9e9c4430d7f"
-CROS_WORKON_TREE="f3082cf7d196becffbc906e9b46d5e2071db97b7"
+CROS_WORKON_COMMIT="d8752e21dc6b41f37e2ab2d5db97eaf1bfb2514e"
+CROS_WORKON_TREE="0b71b982ad2195029b3bd1de56bc77376f9e8d3c"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 PYTHON_COMPAT=( python3_{4,5,6,7} )
diff --git a/chromeos-base/factory/factory-0.2.0-r2115.ebuild b/chromeos-base/factory/factory-0.2.0-r2116.ebuild
similarity index 94%
rename from chromeos-base/factory/factory-0.2.0-r2115.ebuild
rename to chromeos-base/factory/factory-0.2.0-r2116.ebuild
index 7659d34..53496b8 100644
--- a/chromeos-base/factory/factory-0.2.0-r2115.ebuild
+++ b/chromeos-base/factory/factory-0.2.0-r2116.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT="81dd5615011f9417f91d41669acec9e9c4430d7f"
-CROS_WORKON_TREE="f3082cf7d196becffbc906e9b46d5e2071db97b7"
+CROS_WORKON_COMMIT="d8752e21dc6b41f37e2ab2d5db97eaf1bfb2514e"
+CROS_WORKON_TREE="0b71b982ad2195029b3bd1de56bc77376f9e8d3c"
 CROS_WORKON_PROJECT="chromiumos/platform/factory"
 CROS_WORKON_LOCALNAME="platform/factory"
 CROS_WORKON_OUTOFTREE_BUILD=1
diff --git a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r274.ebuild b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r275.ebuild
similarity index 87%
rename from chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r274.ebuild
rename to chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r275.ebuild
index 831dba6..abc853d 100644
--- a/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r274.ebuild
+++ b/chromeos-base/hwid_extractor/hwid_extractor-0.0.1-r275.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("81dd5615011f9417f91d41669acec9e9c4430d7f" "affa5945aeb260f229adc432f6bb91855d1f907a")
-CROS_WORKON_TREE=("26bbcbef154a44e78d52b07eb97332643f03e647" "023c756f20b8f5566813867e074a4d444a80d343")
+CROS_WORKON_COMMIT=("d8752e21dc6b41f37e2ab2d5db97eaf1bfb2514e" "affa5945aeb260f229adc432f6bb91855d1f907a")
+CROS_WORKON_TREE=("787e61f61f8f834c455b1f09040b8c883b56e1bc" "023c756f20b8f5566813867e074a4d444a80d343")
 CROS_WORKON_PROJECT=("chromiumos/platform/factory" "chromiumos/chromite")
 CROS_WORKON_LOCALNAME=("platform/factory" "../chromite")
 CROS_WORKON_SUBTREE=("py" "lib")
diff --git a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6665.ebuild b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6666.ebuild
similarity index 91%
rename from chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6665.ebuild
rename to chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6666.ebuild
index 6b1e7f7..ff2a940 100644
--- a/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6665.ebuild
+++ b/chromeos-base/tast-local-tests-cros/tast-local-tests-cros-0.0.1-r6666.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("6e5095854b910a97b2a0bd744c6a6f94cb95cf0e" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a")
-CROS_WORKON_TREE=("6a653ad8b00bca68363c62aa449ea62370eb22ac" "f962a7d69f70f98e292bc4a8161b165a1d3af867")
+CROS_WORKON_COMMIT=("adfc857770cb68c5a92658689efbecd46413d987" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a")
+CROS_WORKON_TREE=("e3005392b15b79f2265369f719b360f97892b320" "f962a7d69f70f98e292bc4a8161b165a1d3af867")
 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-r6715.ebuild b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6716.ebuild
similarity index 90%
rename from chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6715.ebuild
rename to chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6716.ebuild
index 8d9aca1..68129f0 100644
--- a/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6715.ebuild
+++ b/chromeos-base/tast-remote-tests-cros/tast-remote-tests-cros-0.0.1-r6716.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_COMMIT=("6e5095854b910a97b2a0bd744c6a6f94cb95cf0e" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
-CROS_WORKON_TREE=("6a653ad8b00bca68363c62aa449ea62370eb22ac" "f962a7d69f70f98e292bc4a8161b165a1d3af867" "19a599e153588e7beddcc62b22f526879f2985cf")
+CROS_WORKON_COMMIT=("adfc857770cb68c5a92658689efbecd46413d987" "e4d08848f7ee842b8cc7eef4b5ac40371eab0c5a" "22c5b21a61f6477ec943cde45a66526c0f2c11ad")
+CROS_WORKON_TREE=("e3005392b15b79f2265369f719b360f97892b320" "f962a7d69f70f98e292bc4a8161b165a1d3af867" "19a599e153588e7beddcc62b22f526879f2985cf")
 CROS_WORKON_PROJECT=(
 	"chromiumos/platform/tast-tests"
 	"chromiumos/platform/tast"