diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r16.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r15.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r16.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
index 058620a460..d5acbeb07f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="kinvolk/toolbox"
+CROS_WORKON_PROJECT="flatcar-linux/toolbox"
 CROS_WORKON_LOCALNAME="toolbox"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="9a2919e95acbf2e8e10634d09f45c774db3c97bf" # flatcar-master
+	CROS_WORKON_COMMIT="a851cb8961f092012e4d64ba1e71b27b36b7ec9d" # flatcar-master
 	KEYWORDS="amd64 arm64"
 fi
 
 inherit cros-workon
 
 DESCRIPTION="toolbox"
-HOMEPAGE="https://github.com/kinvolk/toolbox"
+HOMEPAGE="https://github.com/flatcar-linux/toolbox"
 SRC_URI=""
 
 LICENSE="Apache-2.0"