diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
index dd5ce9670a..bfcfd84e05 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
@@ -7,31 +7,6 @@
       {
         "name": "coreos-metadata-sshkeys@.service",
         "enabled": true
-      },
-      {
-        "name": "amazon-ssm-agent.service",
-        "enabled": true,
-        "contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/usr/share/oem\nExecStart=/usr/share/oem/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n"
-      }
-    ]
-  },
-  "storage": {
-    "files": [
-      {
-        "filesystem": "root",
-        "path": "/etc/amazon/ssm/amazon-ssm-agent.json",
-        "contents": {
-          "source": "oem:///ssm/amazon-ssm-agent.json.template"
-        },
-        "mode": 292
-      },
-      {
-        "filesystem": "root",
-        "path": "/etc/amazon/ssm/seelog.xml",
-        "contents": {
-          "source": "oem:///ssm/seelog.xml.template"
-        },
-        "mode": 292
       }
     ]
   }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild
index 6c48367530..563685c3cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild
@@ -13,9 +13,12 @@ KEYWORDS="amd64 arm64 x86"
 IUSE="ec2 openstack brightbox"
 REQUIRED_USE="^^ ( ec2 openstack brightbox )"
 
-RDEPEND="
-	app-emulation/amazon-ssm-agent
-"
+# TODO: The AWS SSM Agent is currently too big for the OEM partition
+# but if it fits, uncomment the following and revert
+# b6abb59c544be13e923a3e7240b5c9395c281fca
+#RDEPEND="
+#       ec2? ( app-emulation/amazon-ssm-agent )
+#"
 
 # no source directory
 S="${WORKDIR}"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
index 8972565484..de038c4d2a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 		sys-boot/grub
 		sys-firmware/edk2-ovmf
 	)
+	app-emulation/amazon-ssm-agent
 	coreos-base/coreos
 	coreos-base/coreos-dev
 	"