diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent
index d0670acced..489787307b 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent
@@ -1,2 +1,4 @@
-coreos:default/linux/amd64/10.0/no-multilib
-coreos:coreos/targets/generic
+..
+:arch/amd64/no-multilib
+portage-stable:features/64bit-native
+:coreos/targets/generic
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent
new file mode 100644
index 0000000000..d3f67d305c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent
@@ -0,0 +1,5 @@
+:base
+:default/linux
+:arch/amd64
+portage-stable:releases/10.0
+:coreos/base
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent
index ce282c2139..f0c938676d 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent
@@ -1 +1,2 @@
-:default/linux/amd64/10.0
+..
+:coreos/targets/sdk
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/make.defaults
rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/package.use
rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent
deleted file mode 100644
index fa03b78cac..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/amd64/no-multilib
-portage-stable:features/64bit-native
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent
index df2732bccd..5449615cdd 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent
@@ -1,2 +1 @@
-..
-portage-stable:releases/10.0
+coreos:coreos/amd64/sdk
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent
deleted file mode 100644
index 158dd88c5c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/amd64