diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index f4a17590d5..987d8b53a0 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -221,11 +221,13 @@ IMG_parallels_DISK_LAYOUT=vm
 IMG_parallels_CONF_FORMAT=pvs
 
 ## ami
-IMG_ami_OEM_PACKAGE=oem-ec2-compat
-IMG_ami_OEM_USE=ec2
 IMG_ami_vmdk_DISK_FORMAT=vmdk_stream
-IMG_ami_vmdk_OEM_PACKAGE=oem-ec2-compat
-IMG_ami_vmdk_OEM_USE=ec2
+IMG_ami_vmdk_OEM_USE=ami
+IMG_ami_vmdk_OEM_PACKAGE=common-oem-files
+IMG_ami_vmdk_SYSEXT=oem-ami
+IMG_ami_OEM_USE=ami
+IMG_ami_OEM_PACKAGE=common-oem-files
+IMG_ami_OEM_SYSEXT=oem-ami
 
 ## openstack, supports ec2's metadata format so use oem-ec2-compat
 IMG_openstack_DISK_FORMAT=qcow2
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0.ebuild
index 14ccd3e11e..63257a37d1 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 OEMIDS=(
+    ami
     azure
     qemu
     vmware
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/10-oem-ami.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/10-oem-ami.conf
new file mode 100644
index 0000000000..6a3228d4be
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/10-oem-ami.conf
@@ -0,0 +1,2 @@
+[Unit]
+Upholds=amazon-ssm-agent.service setup-oem.service
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/setup-oem.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/setup-oem.service
new file mode 100644
index 0000000000..4dbed15d06
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/setup-oem.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Setup OEM
+Before=amazon-ssm-agent.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStartPre=/usr/bin/mkdir --parents /etc/amazon/ssm/ /etc/eks
+ExecStartPre=-/usr/bin/ln --symbolic /usr/share/amazon/ssm/amazon-ssm-agent.json.template /etc/amazon/ssm/amazon-ssm-agent.json
+ExecStartPre=-/usr/bin/ln --symbolic /usr/share/amazon/ssm/seelog.xml.template /etc/amazon/ssm/seelog.xml
+ExecStart=-/usr/bin/ln --symbolic /usr/share/amazon/eks/bootstrap.sh /etc/eks/bootstrap.sh
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/metadata.xml
new file mode 100644
index 0000000000..097975e3ad
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/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-ami/oem-ami-3.2.985.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-3.2.985.0.ebuild
new file mode 100644
index 0000000000..35df1ad8d5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-3.2.985.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright (c) 2013 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="OEM suite for Amazon Machine Images"
+HOMEPAGE="http://aws.amazon.com/ec2/"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+RDEPEND="
+  ~app-emulation/amazon-ssm-agent-${PV}
+  coreos-base/flatcar-eks
+"
+
+# for coreos-base/common-oem-files
+OEM_NAME="Amazon EC2"
+
+S="${WORKDIR}"
+
+src_install() {
+	systemd_dounit "${FILESDIR}/setup-oem.service"
+
+	insinto "$(systemd_get_systemunitdir)/multi-user.target.d"
+	doins "${FILESDIR}/10-oem-ami.conf"
+
+}