diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.17.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.17.ebuild
index 04f4dd3fd0..3a74b63a39 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.17.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.17.ebuild
@@ -24,7 +24,7 @@ src_install() {
 		tag+="-${ARCH}"
 	fi
 
-	exeinto /usr/lib/coreos
+	exeinto /usr/lib/flatcar
 	doexe "${FILESDIR}"/etcd-wrapper
 
 	sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service
index dc02e4965b..d4a57d9b06 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-member.service
@@ -17,12 +17,12 @@ Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
 Environment="ETCD_NAME=%m"
 Environment="ETCD_USER=etcd"
 Environment="ETCD_DATA_DIR=/var/lib/etcd"
-Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/etcd-member-wrapper.uuid"
+Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/etcd-member-wrapper.uuid"
 
-ExecStartPre=/usr/bin/mkdir --parents /var/lib/coreos
-ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/etcd-member-wrapper.uuid
-ExecStart=/usr/lib/coreos/etcd-wrapper $ETCD_OPTS
-ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/etcd-member-wrapper.uuid
+ExecStartPre=/usr/bin/mkdir --parents /var/lib/flatcar
+ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/etcd-member-wrapper.uuid
+ExecStart=/usr/lib/flatcar/etcd-wrapper $ETCD_OPTS
+ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/etcd-member-wrapper.uuid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
index 911b67aed7..fe20813d10 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-docker-opts.service
@@ -10,12 +10,12 @@ Before=docker.service
 Type=oneshot
 
 Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
-Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid"
+Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/flannel-wrapper2.uuid"
 Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh"
 
-ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/flannel-wrapper2.uuid
-ExecStart=/usr/lib/coreos/flannel-wrapper -d /run/flannel/flannel_docker_opts.env -i
-ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/flannel-wrapper2.uuid
+ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/flannel-wrapper2.uuid
+ExecStart=/usr/lib/flatcar/flannel-wrapper -d /run/flannel/flannel_docker_opts.env -i
+ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/flannel-wrapper2.uuid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
index 9171d2cc37..5650a4c707 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flanneld.service
@@ -14,14 +14,14 @@ LimitNPROC=1048576
 
 Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
 Environment="FLANNEL_OPTS=--ip-masq=true"
-Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper.uuid"
+Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/flannel-wrapper.uuid"
 EnvironmentFile=-/run/flannel/options.env
 
 ExecStartPre=/sbin/modprobe ip_tables
-ExecStartPre=/usr/bin/mkdir --parents /var/lib/coreos /run/flannel
-ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/flannel-wrapper.uuid
-ExecStart=/usr/lib/coreos/flannel-wrapper $FLANNEL_OPTS
-ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/flannel-wrapper.uuid
+ExecStartPre=/usr/bin/mkdir --parents /var/lib/flatcar /run/flannel
+ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/flannel-wrapper.uuid
+ExecStart=/usr/lib/flatcar/flannel-wrapper $FLANNEL_OPTS
+ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/flannel-wrapper.uuid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild
index f306643fde..9e9a8bc4fa 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild
@@ -28,7 +28,7 @@ src_install() {
 		tag+="-${ARCH}"
 	fi
 
-	exeinto /usr/lib/coreos
+	exeinto /usr/lib/flatcar
 	doexe "${FILESDIR}"/flannel-wrapper
 
 	sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild
index ae974c5de8..813a654d90 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild
@@ -20,6 +20,6 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
 S=${WORKDIR}
 
 src_install() {
-	exeinto /usr/lib/coreos
+	exeinto /usr/lib/flatcar
 	doexe "${FILESDIR}"/kubelet-wrapper
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.6.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.6.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.6.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.6.2-r1.ebuild
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 b64e98532c..3ecc5bd87e 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,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/locksmith"
+CROS_WORKON_PROJECT="flatcar-linux/locksmith"
 CROS_WORKON_LOCALNAME="locksmith"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/locksmith"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-1.0.0-r1.ebuild
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 994168fe2f..feee6fca90 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="coreos/mayday"
+CROS_WORKON_PROJECT="flatcar-linux/mayday"
 CROS_WORKON_LOCALNAME="mayday"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/mayday"
@@ -11,7 +11,7 @@ inherit coreos-go cros-workon
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64 ~arm64"
 else
-    CROS_WORKON_COMMIT="5e2b4bcb0743ff0105cd193a8d9e4ddc78088153" # v1.0.0
+    CROS_WORKON_COMMIT="78318a5760bea08ff5a76779a070c2c8fbea2939" # flatcar-master
     KEYWORDS="amd64 arm64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
index 2318af1514..8165dd954e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/sdnotify-proxy"
+CROS_WORKON_PROJECT="flatcar-linux/sdnotify-proxy"
 CROS_WORKON_LOCALNAME="sdnotify-proxy"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/sdnotify-proxy"
@@ -11,7 +11,7 @@ inherit coreos-go cros-workon
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="f516129af110fd4a51bd5ea2654f4dc8dd02e5c4"
+	CROS_WORKON_COMMIT="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # flatcar-master
 	KEYWORDS="amd64 arm64"
 fi
 
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 f9d3df7ba6..b9145dbc48 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=4
-CROS_WORKON_PROJECT="coreos/toolbox"
+CROS_WORKON_PROJECT="flatcar-linux/toolbox"
 CROS_WORKON_LOCALNAME="toolbox"
 CROS_WORKON_REPO="git://github.com"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
index eeae087157..a9a63c699d 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/updateservicectl"
+CROS_WORKON_PROJECT="flatcar-linux/updateservicectl"
 CROS_WORKON_LOCALNAME="updateservicectl"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/updateservicectl"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r2.ebuild
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 3141390401..2dc3e0294f 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,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/torcx"
+CROS_WORKON_PROJECT="flatcar-linux/torcx"
 CROS_WORKON_LOCALNAME="torcx"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/torcx"
@@ -34,7 +34,7 @@ src_compile() {
 src_install() {
 	local generatordir=/usr/lib/systemd/system-generators
 	local vendordir=/usr/share/torcx
-	local libcoreosdir=/usr/lib/coreos
+	local libcoreosdir=/usr/lib/flatcar
 
 	# Install generator and userland.
 	exeinto "${generatordir}"
@@ -53,6 +53,6 @@ src_install() {
 	for link in {docker-,}{containerd{,-shim},runc} ctr docker-{init,proxy} dockerd tini
 	do ln -fns docker "${ED}/usr/bin/${link}"
 	done
-	exeinto /usr/lib/coreos
+	exeinto /usr/lib/flatcar
 	newexe "${FILESDIR}/dockerd-wrapper.sh" dockerd
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild
index 46314492a1..c462afcfd1 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-CROS_WORKON_PROJECT="coreos/docker"
+CROS_WORKON_PROJECT="flatcar-linux/docker"
 CROS_WORKON_LOCALNAME="docker"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_VERSION="go1.7"
@@ -269,8 +269,8 @@ src_install() {
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 
-	exeinto /usr/lib/coreos
-	# Create /usr/lib/coreos/dockerd script for backwards compatibility
+	exeinto /usr/lib/flatcar
+	# Create /usr/lib/flatcar/dockerd script for backwards compatibility
 	doexe "${FILESDIR}/dockerd"
 
 	systemd_dounit "${FILESDIR}/docker.service"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild
index 29159f9758..bd83378c16 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-CROS_WORKON_PROJECT="coreos/docker"
+CROS_WORKON_PROJECT="flatcar-linux/docker"
 CROS_WORKON_LOCALNAME="docker"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_VERSION="go1.7"
@@ -251,7 +251,7 @@ src_install() {
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 
-	exeinto /usr/lib/coreos
+	exeinto /usr/lib/flatcar
 	doexe "${FILESDIR}/dockerd"
 
 	systemd_dounit "${FILESDIR}/docker.service"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index 582598e626..edaa0e2fba 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -276,8 +276,8 @@ src_install() {
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 
-	exeinto /usr/lib/coreos
-	# Create /usr/lib/coreos/dockerd for backwards compatibility
+	exeinto /usr/lib/flatcar
+	# Create /usr/lib/flatcar/dockerd for backwards compatibility
 	doexe "${FILESDIR}/dockerd"
 
 	systemd_dounit "${FILESDIR}/docker.service"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-4.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-4.0.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-4.0.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-4.0.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service
index 4ee64ead05..bdbfb5af65 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=CoreOS Metadata Agent (SSH Keys)
+Description=Flatcar Metadata Agent (SSH Keys)
 
 [Service]
 Type=oneshot
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service
index 297177487f..997111aa40 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=CoreOS Metadata Agent
+Description=Flatcar Metadata Agent
 
 [Service]
 Type=oneshot
 Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline
-ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/coreos
+ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/flatcar
 
 [Install]
 RequiredBy=metadata.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem
index 10fcaff58b..bdc2f1af89 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem
@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7pO21yN+b6yx9P+wHzS2
-clxGs18eWxfoleETLbFVmcXu783rgBP0bFjYfqrNZNaI1Ip6bxEYkPacg0xFg7ri
-lNdO/cxJV5Ltj40wFlpmzJOAH8hx5SF8KWg2NV1I6TS8pp+CQqcvvOKu6AIcWfeY
-11V7eJ8rWcDsnqpTg8T1VRxytsg2UjTMfQwzcGLTb8cQ8AV39ED5WC5NdS9Bld4h
-XqS9Dx6Pe3JOQLZze6XIIwWuB2jxGpM1GWfRNm5nxvne3l7ggC970482a7STGK10
-fD8//k8myVxleMAeQoMRXoRq9p3C84H4Bw8v2dX13kFFCgfEQj6SOZ5huXZKLPpB
-LwIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/NZ5Tvc93KynOLPDOxa
+hyAGRKB2NvgF9l2A61SsFw5CuZc/k02u1/BvFehK4XL/eOo90Dt8A2l28D/YKs7g
+2IPUSAnA9hc5OKBbpHsDzisxlAh7kg4FpeeJJWJMzO8NDCG5NZVqXEpGjCmX0qSh
+5MLiTDr9dU2YhLo93/92dKnTvsLjUVv5wnuF55Lt2wJv4CbxVn4hHwotGfSomTBO
++7o6hE3VIIo1C6lkP+FAqMyWKA9s6U0x4tGxCXszW3hPWOANLIT4m0e55ayxiy5A
+ESEVW/xx6Rul75u925m21AqA6wwaEB6ZPKTnUiWoNKNv1xi8LPIz12+0nuE6iT1K
+jQIDAQAB
 -----END PUBLIC KEY-----
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r1.ebuild
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 0c2997f1cd..2bd3864261 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="coreos/coreos-cloudinit"
+CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit"
 CROS_WORKON_LOCALNAME="coreos-cloudinit"
 CROS_WORKON_REPO="git://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 c76e1744a9..d41319f2ef 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="5"
-CROS_WORKON_PROJECT="coreos/init"
+CROS_WORKON_PROJECT="flatcar-linux/init"
 CROS_WORKON_LOCALNAME="init"
 CROS_WORKON_REPO="git://github.com"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r533.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r534.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r533.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r534.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild
index 477bdb45d9..07dc355996 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
-CROS_WORKON_PROJECT="coreos/dev-util"
+CROS_WORKON_PROJECT="flatcar-linux/dev-util"
 CROS_WORKON_REPO="git://github.com"
 CROS_WORKON_LOCALNAME="dev"
 CROS_WORKON_LOCALDIR="src/platform"
@@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="7b9092b9f6d93f00527591a7c393e2be3099278d"
+	CROS_WORKON_COMMIT="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master
 	KEYWORDS="amd64 arm x86"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r578.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r579.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r578.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r579.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
index 8778beede9..29743c54a5 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_PROJECT="coreos/dev-util"
+CROS_WORKON_PROJECT="flatcar-linux/dev-util"
 CROS_WORKON_REPO="git://github.com"
 CROS_WORKON_LOCALNAME="dev"
 CROS_WORKON_LOCALDIR="src/platform"
@@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="7b9092b9f6d93f00527591a7c393e2be3099278d"
+	CROS_WORKON_COMMIT="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
index dfd0032712..e23283b647 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
@@ -1,4 +1,4 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="azure"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
index 2198eec548..17c25d86b8 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
@@ -18,4 +18,4 @@ coreos:
     name: CloudSigma
     version-id: @@OEM_VERSION_ID@@
     home-url: https://www.cloudsigma.com/
-    bug-report-url: https://issues.coreos.com
+    bug-report-url: https://issues.flatcar-linux.org
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
index 8340b10a9d..5c95fb979f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="cloudsigma"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml
index e6327b2ce1..ece76e7899 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/cloud-config.yml
@@ -19,8 +19,8 @@ coreos:
         content: |
           [Unit]
           Description=Cloudinit from CloudStack-style metadata
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
+          Requires=flatcar-setup-environment.service
+          After=flatcar-setup-environment.service
 
           [Service]
           Type=oneshot
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/flatcar-setup-environment
similarity index 75%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/flatcar-setup-environment
index 70540418ca..9462dd7f79 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/flatcar-setup-environment
@@ -14,8 +14,8 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-    -e '/^COREOS_PRIVATE_IPV4=/d' \
+sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
+    -e '/^FLATCAR_PRIVATE_IPV4=/d' \
     "${ENV}"
 
 . /usr/share/oem/bin/cloudstack-dhcp
@@ -26,7 +26,7 @@ METADATA_URL="http://${DHCP_SERVER}/latest/meta-data/"
 block-until-url "${METADATA_URL}"
 
 PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
-echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
+echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
 
 PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
-echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
+echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
index 505593ae25..f35d20bd2a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="cloudstack"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild
index 0c12b6ee08..58ed44114c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudstack/oem-cloudstack-0.0.4.ebuild
@@ -29,7 +29,7 @@ src_install() {
 	dobin "${FILESDIR}/cloudstack-dhcp"
 	dobin "${FILESDIR}/cloudstack-ssh-key"
 	dobin "${FILESDIR}/cloudstack-coreos-cloudinit"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
index f35a82118c..a595676b61 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="digitalocean"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
index f8e8bd5712..2d41cdd4ec 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-brightbox.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings for EC2
+# Flatcar GRUB settings for EC2
 
 set oem_id="brightbox"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
index ac574aae0f..640de525bd 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
@@ -1,4 +1,4 @@
-# CoreOS GRUB settings for EC2
+# Flatcar GRUB settings for EC2
 
 set oem_id="ec2"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
index fbf50a002d..1e71da2f21 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-openstack.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings for EC2
+# Flatcar GRUB settings for EC2
 
 set oem_id="openstack"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml
index 182a5fb260..c76e47250c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/cloud-config.yml
@@ -19,8 +19,8 @@ coreos:
         content: |
           [Unit]
           Description=Cloudinit from exoscale (cloudstack-style) metadata
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
+          Requires=flatcar-setup-environment.service
+          After=flatcar-setup-environment.service
 
           [Service]
           Type=oneshot
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/flatcar-setup-environment
similarity index 74%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/flatcar-setup-environment
index b441401aa5..b538239745 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/flatcar-setup-environment
@@ -14,8 +14,8 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-    -e '/^COREOS_PRIVATE_IPV4=/d' \
+sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
+    -e '/^FLATCAR_PRIVATE_IPV4=/d' \
     "${ENV}"
 
 . /usr/share/oem/bin/exoscale-dhcp
@@ -26,7 +26,7 @@ METADATA_URL="http://${DHCP_SERVER}/latest/"
 block-until-url "${METADATA_URL}"
 
 PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
-echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
+echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
 
 PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
-echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
+echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
index b5dd7b9604..9cdb448381 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="exoscale"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild
index f07a772422..e04c0e2e30 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-exoscale/oem-exoscale-0.0.5.ebuild
@@ -29,7 +29,7 @@ src_install() {
 	dobin "${FILESDIR}/exoscale-dhcp"
 	dobin "${FILESDIR}/exoscale-ssh-key"
 	dobin "${FILESDIR}/exoscale-coreos-cloudinit"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
index 06cfe63351..8366e12a55 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/grub.cfg
@@ -1,4 +1,4 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="gce"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
index b180d08b3a..6137439a24 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/units/oem-gce.service
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/rkt run \
     --volume=etc,kind=host,source=/etc,readOnly=false \
     --volume=home,kind=host,source=/home,readOnly=false \
     --volume=runsystemd,kind=host,source=/run/systemd,readOnly=false \
-    /usr/share/oem/coreos-oem-gce.aci
+    /usr/share/oem/flatcar-oem-gce.aci
 
 ExecStopPost=/usr/bin/rkt gc --mark-only
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
index b7906af6ba..7782d17b95 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-hyperv/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="hyperv"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/cloud-config.yml
index e310f1b032..2c5904d38f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/cloud-config.yml
@@ -20,8 +20,8 @@ coreos:
         content: |
           [Unit]
           Description=Sets SSH key from metadata
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
+          Requires=flatcar-setup-environment.service
+          After=flatcar-setup-environment.service
 
           [Service]
           Type=oneshot
@@ -34,8 +34,8 @@ coreos:
         content: |
           [Unit]
           Description=Cloudinit from CloudStack-style metadata
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
+          Requires=flatcar-setup-environment.service
+          After=flatcar-setup-environment.service
 
           [Service]
           Type=oneshot
@@ -46,8 +46,8 @@ coreos:
         content: |
           [Unit]
           Description=CloudStack Guest Password Reset
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
+          Requires=flatcar-setup-environment.service
+          After=flatcar-setup-environment.service
 
           [Service]
           Type=oneshot
@@ -58,4 +58,4 @@ coreos:
       name: Interoute 
       version-id: @@OEM_VERSION_ID@@
       home-url: http://interoute.com/
-      bug-report-url: https://issues.coreos.com
+      bug-report-url: https://issues.flatcar-linux.org
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/flatcar-setup-environment
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/flatcar-setup-environment
index d694441427..1b6d38b4a3 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/flatcar-setup-environment
@@ -16,8 +16,8 @@ if [[ $? -ne 0 ]]; then
 fi
 
 # Clean up values
-sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-    -e '/^COREOS_PRIVATE_IPV4=/d' \
+sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
+    -e '/^FLATCAR_PRIVATE_IPV4=/d' \
     "${ENV}"
 
 sed -i -e '/^NIC_[0-9]*_IPV4=/d' \
@@ -46,10 +46,10 @@ METADATA_URL="http://${DHCP_SERVER}/latest/meta-data/"
 block-until-url "${METADATA_URL}"
 
 PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
-echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
+echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
 
 PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
-echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
+echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
 
 # Loop to export interoute style info into ENV
 count=1
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
index 89f5a0e213..f3d466d03f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="interoute"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild
index a4c1029e8b..fc0f4a6d08 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-interoute/oem-interoute-0.0.3-r1.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	dobin "${FILESDIR}/cloudstack-set-guest-password"
 	dobin "${FILESDIR}/cloudstack-ssh-key"
 	dobin "${FILESDIR}/cloudstack-coreos-cloudinit"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/cloud-config.yml
index 62104cdb5d..66a1aec9cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/cloud-config.yml
@@ -29,9 +29,9 @@ coreos:
       runtime: yes
       content: |
         [Unit]
-        After=coreos-setup-environment.service
+        After=flatcar-setup-environment.service
         After=vmtoolsd.service
-        Requires=coreos-setup-environment.service
+        Requires=flatcar-setup-environment.service
         Requires=vmtoolsd.service
 
         [Service]
@@ -54,4 +54,4 @@ coreos:
     name: NIFTY Cloud
     version-id: @@OEM_VERSION_ID@@
     home-url: http://cloud.nifty.com/
-    bug-report-url: https://issues.coreos.com
+    bug-report-url: https://issues.flatcar-linux.org
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/flatcar-setup-environment
similarity index 72%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/flatcar-setup-environment
index 3df9436164..58e56ed6b0 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/flatcar-setup-environment
@@ -14,8 +14,8 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-    -e '/^COREOS_PRIVATE_IPV4=/d' \
+sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
+    -e '/^FLATCAR_PRIVATE_IPV4=/d' \
     "${ENV}"
 
 function get_ip () {
@@ -31,5 +31,5 @@ function get_ip () {
     echo $IP
 }
 
-echo COREOS_PUBLIC_IPV4=$(get_ip ens192) >> $ENV
-echo COREOS_PRIVATE_IPV4=$(get_ip ens224) >> $ENV
+echo FLATCAR_PUBLIC_IPV4=$(get_ip ens192) >> $ENV
+echo FLATCAR_PRIVATE_IPV4=$(get_ip ens224) >> $ENV
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
index 4bc1e8bcbf..b4f808396d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="niftycloud"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/niftycloud-coreos-cloudinit b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/niftycloud-coreos-cloudinit
index 45a3de2099..2e579cb690 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/niftycloud-coreos-cloudinit
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/files/niftycloud-coreos-cloudinit
@@ -7,7 +7,7 @@ else
     exit 1
 fi
 
-USER_DATA_DIR=/var/lib/coreos-niftycloud
+USER_DATA_DIR=/var/lib/flatcar-niftycloud
 USER_DATA_PATH=${USER_DATA_DIR}/user-data
 USER_DATA_FLAG=$(${VMTOOLSD} --cmd 'info-get guestinfo.set_user_data')
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild
index 0324c92724..b95034f7ff 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-niftycloud/oem-niftycloud-0.0.3-r1.ebuild
@@ -29,7 +29,7 @@ src_install() {
 	into "/usr/share/oem"
 	dobin "${FILESDIR}/niftycloud-ssh-key"
 	dobin "${FILESDIR}/niftycloud-coreos-cloudinit"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 
 	insinto "/usr/share/oem"
 	doins "${T}/cloud-config.yml"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
index 100f4407a6..dbd914a92c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/grub.cfg
@@ -1,7 +1,7 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="packet"
-set linux_append="coreos.autologin"
+set linux_append="flatcar.autologin"
 
 if [ "$grub_cpu" = i386 ]; then
     set gfxpayload="1024x768x8,1024x768"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service
index 2990e457dc..c74cf022ff 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/units/packet-phone-home.service
@@ -5,7 +5,7 @@ Requires=coreos-metadata.service
 After=coreos-metadata.service
 
 [Service]
-EnvironmentFile=/run/metadata/coreos
+EnvironmentFile=/run/metadata/flatcar
 ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}"
 Restart=on-failure
 RestartSec=2
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
index d57b520564..e05499af36 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
@@ -39,4 +39,4 @@ coreos:
       name: Rackspace OnMetal
       version-id: @@OEM_VERSION_ID@@
       home-url: http://www.rackspace.com/
-      bug-report-url: https://issues.coreos.com
+      bug-report-url: https://issues.flatcar-linux.org
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
index d834fc6cee..9519ecd969 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
@@ -1,4 +1,4 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="rackspace-onmetal"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
index 687ec0214d..d45d8e864b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
@@ -34,4 +34,4 @@ coreos:
     name: Rackspace Cloud Servers
     version-id: @@OEM_VERSION_ID@@
     home-url: https://www.rackspace.com/cloud/servers/
-    bug-report-url: https://issues.coreos.com
+    bug-report-url: https://issues.flatcar-linux.org
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/flatcar-setup-environment
similarity index 72%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/flatcar-setup-environment
index 2e5f9c1bd0..0e3d1ccab2 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/flatcar-setup-environment
@@ -13,8 +13,8 @@ if [ $? -ne 0 ]; then
         exit 1
 fi
 
-sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-    -e '/^COREOS_PRIVATE_IPV4=/d' \
+sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
+    -e '/^FLATCAR_PRIVATE_IPV4=/d' \
     "${ENV}"
 
 # We spin loop until the nova-agent sets up the ip addresses
@@ -31,5 +31,5 @@ function get_ip () {
 	echo $IP	
 }
 
-echo COREOS_PUBLIC_IPV4=$(get_ip eth0) >> $ENV
-echo COREOS_PRIVATE_IPV4=$(get_ip eth1) >> $ENV
+echo FLATCAR_PUBLIC_IPV4=$(get_ip eth0) >> $ENV
+echo FLATCAR_PRIVATE_IPV4=$(get_ip eth1) >> $ENV
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
index e500d8c7ce..8e05a0e064 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="rackspace"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild
index d68ebfed67..da915ec43a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild
@@ -34,5 +34,5 @@ src_install() {
 	doins "${FILESDIR}/grub.cfg"
 
 	into "/usr/share/oem"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
index 964f58ab6c..d42817d100 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-key/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="vagrant"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/files/grub.cfg
index 589ddb7654..22ef469458 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant-virtualbox/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="vagrant-virtualbox"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
index 83377103a4..815afc6b40 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
@@ -16,8 +16,8 @@ BASE_CLOUD_CONFIG = <<EOF
 write_files:
   - path: /etc/environment
     content: |
-      COREOS_PUBLIC_IPV4=%s
-      COREOS_PRIVATE_IPV4=%s
+      FLATCAR_PUBLIC_IPV4=%s
+      FLATCAR_PRIVATE_IPV4=%s
 coreos:
     units:
 EOF
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
index 0fb8fef9ac..2666663f46 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
@@ -7,14 +7,14 @@ coreos:
         content: |
           [Service]
           Type=oneshot
-          ExecStart=/bin/mkdir -p /var/lib/coreos-vagrant
+          ExecStart=/bin/mkdir -p /var/lib/flatcar-vagrant
       - name: coreos-cloudinit-vagrant-user.path
         command: start
         runtime: yes
         content: |
           [Path]
-          PathExists=/var/lib/coreos-vagrant/vagrantfile-user-data
-          Unit=user-cloudinit@var-lib-coreos\x2dvagrant-vagrantfile\x2duser\x2ddata.service
+          PathExists=/var/lib/flatcar-vagrant/vagrantfile-user-data
+          Unit=user-cloudinit@var-lib-flatcar\x2dvagrant-vagrantfile\x2duser\x2ddata.service
     oem:
       id: vagrant
       name: Vagrant
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/flatcar-setup-environment
similarity index 72%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/coreos-setup-environment
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/flatcar-setup-environment
index 616d3d1c96..8d8de14987 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/flatcar-setup-environment
@@ -11,12 +11,12 @@ now=$(date +%s)
 timeout=$(( now + 60 ))
 
 # just block until cloudinit updates environment 
-while ! grep -qs ^COREOS_PUBLIC_IPV4 "$ENV"; do
+while ! grep -qs ^FLATCAR_PUBLIC_IPV4 "$ENV"; do
     if [[ $timeout -lt $(date +%s) ]]; then
         echo "No network configuration provided by Vagrant!" >&2
         echo "Using localhost, for default public and private IPs" >&2
-        echo "COREOS_PUBLIC_IPV4=127.0.0.1" >> "$ENV"
-        echo "COREOS_PRIVATE_IPV4=127.0.0.1" >> "$ENV"
+        echo "FLATCAR_PUBLIC_IPV4=127.0.0.1" >> "$ENV"
+        echo "FLATCAR_PRIVATE_IPV4=127.0.0.1" >> "$ENV"
         exit
     fi
     sleep 0.1
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
index 964f58ab6c..d42817d100 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="vagrant"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
index f05bd704c5..cb0851f4a9 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.3.ebuild
@@ -27,5 +27,5 @@ src_install() {
 	doins "${FILESDIR}/grub.cfg"
 
 	into "/usr/share/oem"
-	dobin "${FILESDIR}/coreos-setup-environment"
+	dobin "${FILESDIR}/flatcar-setup-environment"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/files/grub.cfg
index d062e9c0be..67a990fe17 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-virtualbox/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="virtualbox"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
index 9870f6b70d..a508120a89 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/files/grub.cfg
@@ -1,3 +1,3 @@
-# CoreOS GRUB settings
+# Flatcar GRUB settings
 
 set oem_id="vmware"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.3.0-r2.ebuild
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 347ee46e6b..52c73e85ad 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=7
 
-CROS_WORKON_PROJECT="coreos/update-ssh-keys"
+CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys"
 CROS_WORKON_LOCALNAME="update-ssh-keys"
 CROS_WORKON_REPO="git://github.com"
 
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 752779be0c..4326bfd699 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=5
-CROS_WORKON_PROJECT="coreos/update_engine"
+CROS_WORKON_PROJECT="flatcar-linux/update_engine"
 CROS_WORKON_REPO="git://github.com"
 AUTOTOOLS_AUTORECONF=1
 
@@ -73,9 +73,9 @@ src_install() {
 	autotools-utils_src_install
 
 	if use symlink-usr; then
-		dosym sbin/coreos-postinst /usr/postinst
+		dosym sbin/flatcar-postinst /usr/postinst
 	else
-		dosym usr/sbin/coreos-postinst /postinst
+		dosym usr/sbin/flatcar-postinst /postinst
 	fi
 
 	systemd_dounit systemd/update-engine.service
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.13.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.13.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.13.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.13.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
index 13fb1c36f0..e0258d5232 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/mantle"
+CROS_WORKON_PROJECT="flatcar-linux/mantle"
 CROS_WORKON_LOCALNAME="mantle"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/mantle"
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
index 7abba283d6..3f5f1f282a 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass
@@ -8,7 +8,22 @@
 : ${COREOS_SOURCE_REVISION:=}
 
 COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}"
-COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}"
+
+# $COREOS_KERNEL_SOURCE_NAME is the kernel source name to be used for
+# $KERNEL_DIR, e.g. linux-4.19.0-coreos. This comes from upstream, so
+# Flatcar should not change it.
+#
+# On the other hand, $COREOS_SOURCE_NAME is the kernel name to be used for
+# $KV_OUT_DIR in individual coreos-kernel*.ebuild files. That one needs to
+# have a flatcar-specific name. We cannot define another variable like
+# $FLATCAR_SOURCE_NAME, because it will then be rewritten by upstream changes
+# that set $COREOS_SOURCE_NAME by default. In the Gentoo world, the ebuild
+# for each new version has a totally new file name. So it's hard to replace
+# a new $COREOS_SOURCE_NAME variable for every new ebuild.
+# $COREOS_SOURCE_NAME should be a name without a revision suffix (e.g. "-r1"),
+# because $KV_FULL would not include such a suffix.
+COREOS_KERNEL_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}"
+COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-flatcar"
 
 [[ ${EAPI} != "5" ]] && die "Only EAPI=5 is supported"
 
@@ -29,7 +44,9 @@ RESTRICT="binchecks strip"
 QA_MULTILIB_PATHS="usr/lib/modules/.*/build/scripts/.*"
 
 # Use source installed by coreos-sources
-KERNEL_DIR="${SYSROOT}/usr/src/${COREOS_SOURCE_NAME}"
+# KERNEL_DIR must find the kernel source tree under /usr/src/linux-*-coreos,
+# not /usr/src/linux-*-flatcar, which does not exist at all.
+KERNEL_DIR="${SYSROOT}/usr/src/${COREOS_KERNEL_SOURCE_NAME}"
 
 # Search for an appropriate config in ${FILESDIR}. The config should reflect
 # the kernel version but partial matching is allowed if the config is
@@ -125,7 +142,7 @@ setup_keys() {
 		x509_extensions = myexts
 
 		[ req_distinguished_name ]
-		O = CoreOS, Inc
+		O = Kinvolk GmbH
 		CN = Module signing key for ${KV_FULL}
 
 		[ myexts ]
diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf
index bbd8e21437..c0cd2271f9 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf
@@ -1,8 +1,8 @@
 # Common pool
-server 0.coreos.pool.ntp.org
-server 1.coreos.pool.ntp.org
-server 2.coreos.pool.ntp.org
-server 3.coreos.pool.ntp.org
+server 0.flatcar.pool.ntp.org
+server 1.flatcar.pool.ntp.org
+server 2.flatcar.pool.ntp.org
+server 3.flatcar.pool.ntp.org
 
 # Warning: Using default NTP settings will leave your NTP
 # server accessible to all hosts on the Internet.
diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service
index 0d16f19bc0..4ba6cf249c 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service
@@ -7,7 +7,7 @@ Conflicts=systemd-timesyncd.service
 
 [Service]
 Type=oneshot
-Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org"
+Environment="SERVER=0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
 ExecStart=/usr/sbin/ntpdate -b -u $SERVER
 RemainAfterExit=yes
 
diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service
index 98aa475770..60a5784d50 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service
+++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service
@@ -7,7 +7,7 @@ Conflicts=systemd-timesyncd.service
 
 [Service]
 Type=oneshot
-Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org"
+Environment="SERVER=0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
 ExecStart=/usr/bin/sntp -s $SERVER
 RemainAfterExit=yes
 
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
index 3c0e1fee21..6703f07327 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use
@@ -9,6 +9,9 @@ sys-apps/coreutils	    selinux
 # Enable SELinux for runc
 app-emulation/runc          selinux
 
+# Enable SELinux for tar
+app-arch/tar                selinux
+
 # Only ship microcode currently distributed by Intel
 # See https://bugs.gentoo.org/654638#c11 by iucode-tool maintainer
 sys-firmware/intel-microcode vanilla
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/package.use
new file mode 100644
index 0000000000..337d8426c1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/package.use
@@ -0,0 +1,5 @@
+# Enable SELinux for amd64 targets
+app-arch/tar                selinux
+sys-apps/coreutils          selinux
+coreos-base/coreos          selinux
+
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/use.mask
new file mode 100644
index 0000000000..a24662d0ea
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/use.mask
@@ -0,0 +1,2 @@
+# Unmask selinux so it can be enabled selectively in package.use
+-selinux
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 169433f4f6..27a70eb765 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="5"
-CROS_WORKON_PROJECT="coreos/baselayout"
+CROS_WORKON_PROJECT="flatcar-linux/baselayout"
 CROS_WORKON_LOCALNAME="baselayout"
 CROS_WORKON_REPO="git://github.com"
 
@@ -129,11 +129,11 @@ src_install() {
 		rmdir "${D}${mnt}" || die
 	done
 
-	doenvd "env.d/99coreos_ldpath"
+	doenvd "env.d/99flatcar_ldpath"
 
 	# Add /sbin:/bin into the PATH when they aren't links into /usr.
 	if ! use symlink-usr; then
-		echo ROOTPATH=/sbin:/bin > "${D}"/etc/env.d/99coreos_bin || die
+		echo ROOTPATH=/sbin:/bin > "${D}"/etc/env.d/99flatcar_bin || die
 	fi
 
 	# handle multilib paths.  do it here because we want this behavior
@@ -172,7 +172,7 @@ src_install() {
 		# Provided by vim in the SDK
 		rm -r "${D}"/etc/vim || die
 		# Undesirable in the SDK
-		rm "${D}"/etc/profile.d/coreos-profile.sh || die
+		rm "${D}"/etc/profile.d/flatcar-profile.sh || die
 	else
 		# Don't install /etc/issue since it is handled by coreos-init right now
 		rm "${D}"/etc/issue || die
@@ -180,10 +180,10 @@ src_install() {
 			"${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die
 
 		# Initialize /etc/passwd, group, and friends on boot.
-		bash "scripts/coreos-tmpfiles" "${D}" || die
-		dosbin "scripts/coreos-tmpfiles"
-		systemd_dounit "scripts/coreos-tmpfiles.service"
-		systemd_enable_service sysinit.target coreos-tmpfiles.service
+		bash "scripts/flatcar-tmpfiles" "${D}" || die
+		dosbin "scripts/flatcar-tmpfiles"
+		systemd_dounit "scripts/flatcar-tmpfiles.service"
+		systemd_enable_service sysinit.target flatcar-tmpfiles.service
 	fi
 
 	# sssd not yet building on arm64
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.33.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.33.0-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.33.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.33.0-r2.ebuild
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 eb0c7ad268..70ba3c7696 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
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CROS_WORKON_PROJECT="coreos/ignition"
+CROS_WORKON_PROJECT="flatcar-linux/ignition"
 CROS_WORKON_LOCALNAME="ignition"
 CROS_WORKON_REPO="git://github.com"
 COREOS_GO_PACKAGE="github.com/coreos/ignition"
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 5263de4b2a..14ef5ee2f5 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=5
-CROS_WORKON_PROJECT="coreos/seismograph"
+CROS_WORKON_PROJECT="flatcar-linux/seismograph"
 CROS_WORKON_REPO="git://github.com"
 AUTOTOOLS_AUTORECONF=1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild
index 7f903c2287..aca12e7a22 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-CROS_WORKON_PROJECT="coreos/systemd"
+CROS_WORKON_PROJECT="flatcar-linux/systemd"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ ${PV} == 9999 ]]; then
 	# Use ~arch instead of empty keywords for compatibility with cros-workon
 	KEYWORDS="~amd64 ~arm64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="f0da8f71d9894f90b60d61a3e461a8b1269295d5" # v241-coreos
+	CROS_WORKON_COMMIT="eef3280c187daad7435aaea9180429feacbf4ca7" # v241-flatcar
 	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -274,7 +274,7 @@ multilib_src_configure() {
 		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
 		-Ddbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
 
-		-Dntp-servers="0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org"
+		-Dntp-servers="0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
 
 		-Dpamconfdir=/usr/share/pam.d
 
@@ -371,7 +371,7 @@ multilib_src_install_all() {
 	fowners root:systemd-journal /var/log/journal
 	fperms 2755 /var/log/journal
 
-	systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
+	systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
 
 	# Don't default to graphical.target
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service
index 41c04ca1d6..064392c7c8 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid-initiatorname.service
@@ -7,4 +7,4 @@ DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.coreos.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi'
+ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.flatcar.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi'
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r5.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r5.ebuild
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 d554692425..018215532b 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,14 +3,14 @@
 
 EAPI=6
 
-CROS_WORKON_PROJECT="coreos/grub"
+CROS_WORKON_PROJECT="flatcar-linux/grub"
 CROS_WORKON_REPO="git://github.com"
 GRUB_AUTOGEN=1  # We start from Git, so always autogen.
 
 if [[ ${PV} == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="c6b9a0af3d7483d5b5c5f79caf7ced64298bd4ac"
+	CROS_WORKON_COMMIT="7ee80206a61de3e5ba1ea03b0054b95d891a3511"  # flatcar-master
 	KEYWORDS="amd64 arm64 x86"
 fi
 inherit cros-workon
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 5e785947dd..ef25c0b950 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=5
-CROS_WORKON_PROJECT="coreos/shim"
+CROS_WORKON_PROJECT="flatcar-linux/shim"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r1.ebuild
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 ce47401b50..2b33012578 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=5
-CROS_WORKON_PROJECT="coreos/bootengine"
+CROS_WORKON_PROJECT="flatcar-linux/bootengine"
 CROS_WORKON_LOCALNAME="bootengine"
 CROS_WORKON_OUTOFTREE_BUILD=1
 CROS_WORKON_REPO="git://github.com"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.81-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.81-r1.ebuild
index 5fb516a5d2..c675305bfa 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.81-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.81-r1.ebuild
@@ -11,6 +11,7 @@ ETYPE="sources"
 K_BASE_VER="4.19"
 
 inherit kernel-2
+EXTRAVERSION="-flatcar"
 detect_version
 
 DESCRIPTION="Full sources for the CoreOS Linux kernel"
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 45ca9a2727..d372d9d06c 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="5"
-CROS_WORKON_PROJECT="coreos/nss-altfiles"
+CROS_WORKON_PROJECT="flatcar-linux/nss-altfiles"
 CROS_WORKON_LOCALNAME="nss-altfiles"
 CROS_WORKON_REPO="git://github.com"