diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.4.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.4.0.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
index 42a041a9b0..2a35aa5b7b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild
@@ -11,7 +11,7 @@ inherit coreos-go cros-workon systemd
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="d976d664051f5b95ab60f7f1770b1b2bcc2877b2" # v0.3.0
+	CROS_WORKON_COMMIT="a40c25b40b6b57aa76a4a4b381136d4a0733edd6" # v0.4.0
 	KEYWORDS="amd64 arm64"
 fi
 
@@ -24,11 +24,13 @@ SLOT="0"
 IUSE=""
 
 src_compile() {
+	export GO15VENDOREXPERIMENT="1"
 	GO_LDFLAGS="-X main.version $(git describe --dirty)" || die
-	go_build "${COREOS_GO_PACKAGE}/src"
+	go_build "${COREOS_GO_PACKAGE}/internal"
 }
 
 src_install() {
-	newbin "${GOBIN}/src" "${PN}"
+	newbin "${GOBIN}/internal" "${PN}"
 	systemd_dounit "${FILESDIR}/coreos-metadata.service"
+	systemd_dounit "${FILESDIR}/coreos-metadata-sshkeys@.service"
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service
new file mode 100644
index 0000000000..6090225250
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=CoreOS Metadata Agent (SSH Keys)
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/coreos-metadata --cmdline --ssh-keys=%i
+
+[Install]
+DefaultInstance=core
+RequiredBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service
index 8b1188c762..12e391d740 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service
@@ -3,7 +3,7 @@ Description=CoreOS Metadata Agent
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/coreos-metadata --cmdline --output=/run/metadata/coreos
+ExecStart=/usr/bin/coreos-metadata --cmdline --attributes=/run/metadata/coreos
 
 [Install]
 RequiredBy=metadata.target