diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0-r1.ebuild
similarity index 80%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0-r1.ebuild
index 1f31e8b76f..ce6c39e455 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/amazon-ssm-agent/amazon-ssm-agent-2.3.1319.0-r1.ebuild
@@ -28,23 +28,25 @@ src_prepare() {
 }
 
 src_compile() {
+	go_export
+
 	# this is replication of commands from the vendor makefile
 	# but without network activity during build phase
 	local GO_LDFLAGS="-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs"
 	export GOPATH="${WORKDIR}/${PN}-${PV}"
 	export GO111MODULE="off"
 	# set agent release version
-	BRAZIL_PACKAGE_VERSION=${PV} go run ./agent/version/versiongenerator/version-gen.go
+	BRAZIL_PACKAGE_VERSION=${PV} ${EGO} run ./agent/version/versiongenerator/version-gen.go
 	# build all the tools
-	go build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
+	${EGO} build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
 		-o bin/amazon-ssm-agent ./agent || die
-	go build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
+	${EGO} build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
 		-o bin/ssm-cli ./agent/cli-main || die
-	go build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
+	${EGO} build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
 		-o bin/ssm-document-worker ./agent/framework/processor/executer/outofproc/worker || die
-	go build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
+	${EGO} build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
 		-o bin/ssm-session-logger ./agent/session/logging || die
-	go build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
+	${EGO} build -v -ldflags "${GO_LDFLAGS}" -buildmode=pie \
 		-o bin/ssm-session-worker ./agent/framework/processor/executer/outofproc/sessionworker || die
 }
 
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 bfcfd84e05..dd5ce9670a 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,6 +7,31 @@
       {
         "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 7d029caff1..f02447c2fb 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,13 +13,8 @@ KEYWORDS="amd64 arm64 x86"
 IUSE="ec2 openstack brightbox aws_pro"
 REQUIRED_USE="^^ ( ec2 openstack brightbox aws_pro )"
 
-# 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 )
-#"
 RDEPEND="
+       ec2? ( app-emulation/amazon-ssm-agent )
        aws_pro? (
         coreos-base/flatcar-eks
         x11-drivers/nvidia-drivers