diff --git a/data/data/agent/files/usr/local/bin/agent-gather b/data/data/agent/files/usr/local/bin/agent-gather
index c201f08a7dc..a2a0478db78 100644
--- a/data/data/agent/files/usr/local/bin/agent-gather
+++ b/data/data/agent/files/usr/local/bin/agent-gather
@@ -78,6 +78,8 @@ function gather_storage_data() {
 	cp /etc/mtab "${ARTIFACTS_DIR}/etc/mtab"
 	( >&2 echo -n ".")
 	lsblk > "${ARTIFACTS_DIR}/lsblk"
+	( >&2 echo -n ".")
+        df -h > "${ARTIFACTS_DIR}/df"
 	( >&2 echo " Done")
 }
 
diff --git a/data/data/bootstrap/files/etc/systemd/system/node-image-pull.service b/data/data/bootstrap/files/etc/systemd/system/node-image-pull.service
index 8ac36d75b8c..4c5e69333d8 100644
--- a/data/data/bootstrap/files/etc/systemd/system/node-image-pull.service
+++ b/data/data/bootstrap/files/etc/systemd/system/node-image-pull.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Node Image Pull
+Wants=var-ostree\x2dcontainer.mount
 Requires=network.target NetworkManager.service
-After=network.target
+After=network.target var-ostree\x2dcontainer.mount
 
 [Service]
 Type=oneshot
diff --git "a/data/data/bootstrap/files/etc/systemd/system/var-ostree\\x2dcontainer.mount" "b/data/data/bootstrap/files/etc/systemd/system/var-ostree\\x2dcontainer.mount"
new file mode 100644
index 00000000000..674eb2ba76a
--- /dev/null
+++ "b/data/data/bootstrap/files/etc/systemd/system/var-ostree\\x2dcontainer.mount"
@@ -0,0 +1,10 @@
+[Unit]
+Requires=run-ephemeral.mount
+After=run-ephemeral.mount
+ConditionPathExists=/run/ostree-live
+
+[Mount]
+What=tmpfs
+Where=/var/ostree-container
+Type=tmpfs
+Options=size=4G
diff --git a/data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template b/data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
index ba7bcaf4198..7b321c3c9d0 100755
--- a/data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
+++ b/data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
@@ -85,6 +85,8 @@ ostree checkout --repo "${ostree_repo}" ${hardlink} coreos/node-image "${ostree_
 
 # in the assisted-installer case, nuke the temporary repo to save RAM
 if grep -q coreos.liveiso= /proc/cmdline; then
+    df -h "${ostree_repo}"
     echo "Deleting temporary repo"
     rm -rf "${ostree_repo}"
+    df -h "${ostree_checkout}"
 fi