diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.2.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.2.2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.2.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.2.2.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 44122dced6..23b3736501 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="aff2fffff26260974eac95855d5fb0d0bf4f43b3" # v0.2.1
+	CROS_WORKON_COMMIT="67305322c857e1e3f0c9b9f0924c9e60291981cd" # v0.2.2
 	KEYWORDS="amd64 arm64"
 fi
 
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 05e4f7fb53..8b1188c762 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,8 +3,7 @@ Description=CoreOS Metadata Agent
 
 [Service]
 Type=oneshot
-EnvironmentFile=/usr/share/oem/oem-release
-ExecStart=/usr/bin/coreos-metadata --provider=${OEM_ID} --output=/run/metadata/coreos
+ExecStart=/usr/bin/coreos-metadata --cmdline --output=/run/metadata/coreos
 
 [Install]
 RequiredBy=metadata.target