diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
index 917ed3f933..f3ca65b7b7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service
@@ -5,9 +5,6 @@ DefaultDependencies=false
 Requires=local-fs-pre.target
 Before=local-fs-pre.target
 
-Requires=mnt-oem.mount
-After=mnt-oem.mount
-
 # setup networking
 Wants=initrd-systemd-networkd.service
 After=initrd-systemd-networkd.service
@@ -21,6 +18,5 @@ After=disk-uuid.service
 
 [Service]
 Type=oneshot
-Environment=OEM_ID=pxe
-EnvironmentFile=-/mnt/oem/oem-release
+EnvironmentFile=/run/ignition.env
 ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=disks
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
index 1833e5777e..b68db08b9c 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service
@@ -6,9 +6,6 @@ Before=initrd-parse-etc.service
 Requires=initrd-root-fs.target
 After=initrd-root-fs.target
 
-Requires=mnt-oem.mount
-After=mnt-oem.mount
-
 Requires=ignition-disks.service
 After=ignition-disks.service
 
@@ -26,6 +23,5 @@ After=initrd-systemd-resolved.service
 
 [Service]
 Type=oneshot
-Environment=OEM_ID=pxe
-EnvironmentFile=-/mnt/oem/oem-release
+EnvironmentFile=/run/ignition.env
 ExecStart=/usr/bin/ignition --root=/sysroot --oem=${OEM_ID} --stage=files
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount
deleted file mode 100644
index bfe9ed74b9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-DefaultDependencies=false
-Before=initrd-switch-root.target
-
-[Mount]
-What=/dev/disk/by-label/OEM
-Where=/mnt/oem
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.2.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.2.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.2.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.2.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
index 3254c72e39..f29d6c01f7 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild
@@ -31,7 +31,6 @@ src_compile() {
 src_install() {
 	newbin ${GOBIN}/src ${PN}
 
-	systemd_dounit "${FILESDIR}"/mnt-oem.mount
 	systemd_dounit "${FILESDIR}"/ignition.target
 	systemd_dounit "${FILESDIR}"/ignition-disks.service
 	systemd_dounit "${FILESDIR}"/ignition-files.service