diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
index eb533f6a6a..123bddf7eb 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
@@ -12,12 +12,11 @@ source make.conf.board_setup
 # Common settings across all board targets.
 source make.conf.common
 
-# TODO: set $BOARD in make.conf.board_setup and use it
 PORTAGE_BINHOST="
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_VERSION_STRING}/pkgs/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_VERSION_STRING}/toolchain/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_SDK_VERSION}/pkgs/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_SDK_VERSION}/toolchain/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/pkgs/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/toolchain/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/pkgs/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/toolchain/
 "
 
 # Recommended MARCH_TUNE, CFLAGS, etc.