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 c147e545a8..e806d1a890 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
@@ -9,6 +9,13 @@ After=initrd-root-fs.target
 Requires=mnt-oem.mount
 After=mnt-oem.mount
 
+Requires=ignition-disks.service
+After=ignition-disks.service
+
+# setup the root filesystem before we try do things like create users on it.
+Requires=initrd-setup-root.service
+After=initrd-setup-root.service
+
 # setup networking
 Wants=initrd-systemd-networkd.service
 After=initrd-systemd-networkd.service
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3-r1.ebuild