diff --git a/roles/1-prep/templates/iiab-expand-rootfs.service b/roles/1-prep/templates/iiab-expand-rootfs.service
index f7f68402c..89e42f2ab 100644
--- a/roles/1-prep/templates/iiab-expand-rootfs.service
+++ b/roles/1-prep/templates/iiab-expand-rootfs.service
@@ -1,5 +1,8 @@
 [Unit]
 Description=Root Filesystem Auto-Expander
+DefaultDependencies=no
+After=systemd-remount-fs.service
+Before=dphys-swapfile.service
 
 [Service]
 Environment=TERM=linux
@@ -8,7 +11,7 @@ ExecStart=/usr/sbin/iiab-expand-rootfs
 # "Standard output type syslog is obsolete"
 # StandardError=syslog
 # WHEREAS StandardError=journal is the default, per https://www.freedesktop.org/software/systemd/man/systemd.exec.html#StandardOutput=
-RemainAfterExit=no
+RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=local-fs.target