diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 70c4564ef3..3721c7b15b 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -28,6 +28,7 @@ VALID_IMG_TYPES=(
     rackspace
     rackspace_onmetal
     rackspace_vhd
+    scaleway
     vagrant
     vagrant_parallels
     vagrant_virtualbox
@@ -54,6 +55,7 @@ VALID_OEM_PACKAGES=(
     qemu
     rackspace
     rackspace-onmetal
+    scaleway
     vagrant
     vagrant-key
     vagrant-virtualbox
@@ -304,6 +306,13 @@ IMG_packet_OEM_PACKAGE=common-oem-files
 IMG_packet_OEM_SYSEXT=oem-packet
 IMG_packet_OEM_USE=packet
 
+## scaleway
+IMG_scaleway_DISK_FORMAT=qcow2
+IMG_scaleway_DISK_LAYOUT=vm
+IMG_scaleway_OEM_PACKAGE=common-oem-files
+IMG_scaleway_OEM_USE=scaleway
+IMG_scaleway_OEM_SYSEXT=oem-scaleway
+
 ###########################################################
 
 # Print the default vm type for the specified board
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild
similarity index 99%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild
index d48d555dcd..c1dd66b61d 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r6.ebuild
@@ -34,6 +34,7 @@ COMMON_OEMIDS=(
     openstack
     packet
     qemu
+    scaleway
 )
 
 ARM64_ONLY_OEMIDS=(
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/metadata.xml
new file mode 100644
index 0000000000..097975e3ad
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/oem-scaleway-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/oem-scaleway-0.ebuild
new file mode 100644
index 0000000000..a178f940f9
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-scaleway/oem-scaleway-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OEM suite for Scaleway"
+HOMEPAGE="https://www.scaleway.com"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+OEM_NAME="Scaleway"