diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
index ebc8352913..26ab32c5cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/locksmith"
+CROS_WORKON_PROJECT="flatcar/locksmith"
 CROS_WORKON_LOCALNAME="locksmith"
 CROS_WORKON_REPO="https://github.com"
-COREOS_GO_PACKAGE="github.com/flatcar-linux/locksmith"
+COREOS_GO_PACKAGE="github.com/flatcar/locksmith"
 inherit cros-workon systemd coreos-go
 
 if [[ "${PV}" == 9999 ]]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild
index 66ee6e9e3e..1da700c128 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/mayday"
+CROS_WORKON_PROJECT="flatcar/mayday"
 CROS_WORKON_LOCALNAME="mayday"
 CROS_WORKON_REPO="https://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/mayday"
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 15ae71dda7..9520a0f184 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,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/toolbox"
+CROS_WORKON_PROJECT="flatcar/toolbox"
 CROS_WORKON_LOCALNAME="toolbox"
 CROS_WORKON_REPO="https://github.com"
 
@@ -16,7 +16,7 @@ fi
 inherit cros-workon
 
 DESCRIPTION="toolbox"
-HOMEPAGE="https://github.com/flatcar-linux/toolbox"
+HOMEPAGE="https://github.com/flatcar/toolbox"
 SRC_URI=""
 
 LICENSE="Apache-2.0"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild
index 0082fbe3b1..2580993bb8 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/torcx"
+CROS_WORKON_PROJECT="flatcar/torcx"
 CROS_WORKON_LOCALNAME="torcx"
 CROS_WORKON_REPO="https://github.com"
-COREOS_GO_PACKAGE="github.com/flatcar-linux/torcx"
+COREOS_GO_PACKAGE="github.com/flatcar/torcx"
 COREOS_GO_GO111MODULE="off"
 
 if [[ "${PV}" == 9999 ]]; then
@@ -18,7 +18,7 @@ fi
 inherit coreos-go cros-workon systemd
 
 DESCRIPTION="torcx is a boot-time addon manager for immutable systems"
-HOMEPAGE="https://github.com/flatcar-linux/torcx"
+HOMEPAGE="https://github.com/flatcar/torcx"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index 345f6af511..8da736b76e 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit"
+CROS_WORKON_PROJECT="flatcar/coreos-cloudinit"
 CROS_WORKON_LOCALNAME="coreos-cloudinit"
 CROS_WORKON_REPO="https://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index b628eed828..b67e14ca3a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/init"
+CROS_WORKON_PROJECT="flatcar/init"
 CROS_WORKON_LOCALNAME="init"
 CROS_WORKON_REPO="https://github.com"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
index c5ddbe7750..c53a815397 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/flatcar-dev-util"
+CROS_WORKON_PROJECT="flatcar/flatcar-dev-util"
 CROS_WORKON_REPO="https://github.com"
 CROS_WORKON_LOCALNAME="dev"
 CROS_WORKON_LOCALDIR="src/platform"
@@ -19,7 +19,7 @@ PYTHON_COMPAT=( python3_{6..10} )
 inherit cros-workon python-single-r1
 
 DESCRIPTION="emerge utilities for Flatcar developer images"
-HOMEPAGE="https://github.com/flatcar-linux/flatcar-dev-util/"
+HOMEPAGE="https://github.com/flatcar/flatcar-dev-util/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-12.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-12.1.0.ebuild
index 6b09b72c9f..357d9cdd08 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-12.1.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-12.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="OEM suite for VMware"
-HOMEPAGE="https://github.com/flatcar-linux/coreos-overlay/tree/main/coreos-base"
+HOMEPAGE="https://github.com/flatcar/coreos-overlay/tree/main/coreos-base"
 SRC_URI=""
 
 LICENSE="Apache-2.0"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
index 935164ef8d..6cbef7b1da 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys"
+CROS_WORKON_PROJECT="flatcar/update-ssh-keys"
 CROS_WORKON_LOCALNAME="update-ssh-keys"
 CROS_WORKON_REPO="https://github.com"
 
@@ -52,7 +52,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 inherit coreos-cargo cros-workon
 
 DESCRIPTION="Utility for managing OpenSSH authorized public keys"
-HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys"
+HOMEPAGE="https://github.com/flatcar/update-ssh-keys"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index 8d1167674d..76e4120b68 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/update_engine"
+CROS_WORKON_PROJECT="flatcar/update_engine"
 CROS_WORKON_REPO="https://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc.slsa-provenance b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc.slsa-provenance
index f6eb9ad981..79cc891edf 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc.slsa-provenance
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc.slsa-provenance
@@ -67,7 +67,7 @@ __slsa_provenance_materials() {
     # The ebuild. Since "configSource" in "invocation" cannot have more than one (top/level) entry
     #  we add the ebuild and git repo checksum here, as a material.
     csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")"
-    uri="git+https://github.com/flatcar-linux/${repo}.git@${csum}#${ebuild}"
+    uri="git+https://github.com/flatcar/${repo}.git@${csum}#${ebuild}"
     echo -e "      { \"uri\": \"${uri}\","
     echo -n "        \"digest\": {\"sha1\":\"${ebuildcsum}\"} }"
 
@@ -115,7 +115,7 @@ __slsa_provenance_materials() {
 
     # Patches / files shipped with the ebuild (if any)
     csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")"
-    uri="git+https://github.com/flatcar-linux/${repo}.git@${csum}#${CATEGORY}/${PN}/files"
+    uri="git+https://github.com/flatcar/${repo}.git@${csum}#${CATEGORY}/${PN}/files"
     if [ -d "${FILESDIR}" ] ; then
         for file in $(cd "$FILESDIR" && find . -type f | sed 's:^./::') ; do
             csum="$(sha1sum - <"${FILESDIR}/${file}")"
@@ -155,7 +155,7 @@ cat <<EOF
    "builder": {"id": "TODO - builder ID" },
    "invocation": {
       "configSource": {
-        "uri": "https://github.com/flatcar-linux/scripts",
+        "uri": "https://github.com/flatcar/scripts",
         "digest": {"sha1": "${scripts_hash}"}
       }
    },
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
index 70574b6e64..3966cf427d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/baselayout"
+CROS_WORKON_PROJECT="flatcar/baselayout"
 CROS_WORKON_LOCALNAME="baselayout"
 CROS_WORKON_REPO="https://github.com"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
index 3a7a05f4e2..9b2d0b07b4 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 CROS_WORKON_PROJECT="coreos/ignition"
 CROS_WORKON_LOCALNAME="ignition"
 CROS_WORKON_REPO="https://github.com"
-COREOS_GO_PACKAGE="github.com/flatcar-linux/ignition/v2"
+COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2"
 COREOS_GO_GO111MODULE="off"
 inherit coreos-go cros-workon systemd udev
 
@@ -62,7 +62,7 @@ PATCHES=(
 
 src_compile() {
 	export GO15VENDOREXPERIMENT="1"
-	GO_LDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar-linux/ignition/v2/internal/distro.selinuxRelabel=false" || die
+	GO_LDFLAGS="-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" || die
 	go_build "${COREOS_GO_PACKAGE}/internal"
 }
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
index cfebe04e87..dae18e813d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/seismograph"
+CROS_WORKON_PROJECT="flatcar/seismograph"
 CROS_WORKON_REPO="https://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/CHECKLIST.md b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/CHECKLIST.md
index 2334feda57..0685b359fd 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/CHECKLIST.md
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/CHECKLIST.md
@@ -1 +1 @@
-- Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar-linux/init:systemd/system/ensure-sysext.service`
+- Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar/init:systemd/system/ensure-sysext.service`
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild
index e67f3e3e44..b8f1582d7d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-250.3.ebuild
@@ -401,7 +401,7 @@ multilib_src_configure() {
 
 		# Flatcar: Set latest network interface naming scheme
 		# for
-		# https://github.com/flatcar-linux/Flatcar/issues/36
+		# https://github.com/flatcar/Flatcar/issues/36
 		-Ddefault-net-naming-scheme=latest
 
 		# Flatcar: Unported options, still needed?
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild
index 94f699335c..7703a9f528 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-CROS_WORKON_PROJECT="flatcar-linux/grub"
+CROS_WORKON_PROJECT="flatcar/grub"
 CROS_WORKON_REPO="https://github.com"
 GRUB_AUTOGEN=1  # We start from Git, so always autogen.
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
index 975b8345e3..b2e4e6bd06 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/shim"
+CROS_WORKON_PROJECT="flatcar/shim"
 CROS_WORKON_REPO="https://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/README.md b/sdk_container/src/third_party/coreos-overlay/sys-kernel/README.md
index 2a42af2e80..4b0e5261e2 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/README.md
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/README.md
@@ -41,7 +41,7 @@ and only installs files modules declare as required.
 # Keep kernel, kernel headers, and perf aligned
 
 When updating the kernel to a new major release please make sure to also update
-[the kernel headers](https://github.com/flatcar-linux/portage-stable/tree/main/sys-kernel/linux-headers)
+[the kernel headers](https://github.com/flatcar/portage-stable/tree/main/sys-kernel/linux-headers)
 and
-[perf](https://github.com/flatcar-linux/portage-stable/tree/main/dev-util/perf)
+[perf](https://github.com/flatcar/portage-stable/tree/main/dev-util/perf)
 to the same major version.
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
index cd5e7b7eb8..2b82c452ab 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/bootengine"
+CROS_WORKON_PROJECT="flatcar/bootengine"
 CROS_WORKON_LOCALNAME="bootengine"
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_REPO="https://github.com"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
index 45b30211ca..2a307491c7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="flatcar-linux/nss-altfiles"
+CROS_WORKON_PROJECT="flatcar/nss-altfiles"
 CROS_WORKON_LOCALNAME="nss-altfiles"
 CROS_WORKON_REPO="https://github.com"