diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index 9af0769..a813607 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -243,6 +243,7 @@ RUN cd /usr/lib/gcc/arm-none-eabi/* && \
 RUN ldconfig
 
 # Setup RO rootfs
+RUN mkdir -p /tmprw
 RUN mkdir -p /tmptmp
 COPY ./userspace/readonly_setup.sh /tmptmp/readonly_setup.sh
 RUN /tmptmp/readonly_setup.sh && rm -rf /tmptmp
diff --git a/userspace/files/fs_setup.service b/userspace/files/fs_setup.service
index 2558d6e..1c8c515 100644
--- a/userspace/files/fs_setup.service
+++ b/userspace/files/fs_setup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Setup rootfs
-After=data.mount tmp.mount var.mount
+After=data.mount tmp.mount tmprw.mount var.mount
 Before=local-fs.target
 DefaultDependencies=no
 
diff --git a/userspace/files/fstab b/userspace/files/fstab
index 14929c6..eae3041 100644
--- a/userspace/files/fstab
+++ b/userspace/files/fstab
@@ -6,3 +6,4 @@
 /dev/nvme0n1 /data/media auto discard,nosuid,nodev,nofail,x-systemd.device-timeout=5s 0 0
 tmpfs /var tmpfs rw,nosuid,nodev,size=128M,mode=755 0 0
 tmpfs /tmp tmpfs rw,nosuid,nodev,size=150M,mode=1777 0 0
+tmpfs /tmprw tmpfs rw,nosuid,nodev,size=100M,mode=1777 0 0
diff --git a/userspace/usr/comma/fs_setup.sh b/userspace/usr/comma/fs_setup.sh
index 444474f..7cdd1dd 100755
--- a/userspace/usr/comma/fs_setup.sh
+++ b/userspace/usr/comma/fs_setup.sh
@@ -7,7 +7,10 @@
 systemd-tmpfiles --create /usr/comma/tmpfiles.conf
 
 # setup /home
-mount -t overlay overlay -o lowerdir=/usr/default/home,upperdir=/tmp/rw/home_upper,workdir=/tmp/rw/home_work /home
+mkdir -p /tmprw/home_work
+mkdir -p /tmprw/home_upper
+chmod 755 /tmprw/*
+mount -t overlay overlay -o lowerdir=/usr/default/home,upperdir=/tmprw/home_upper,workdir=/tmprw/home_work /home
 
 # /etc
 mkdir -p /data/etc
@@ -22,6 +25,10 @@ mkdir -p /data/media
 mkdir -p /data/ssh
 chown comma: /data/ssh
 
+# /data/tmp - clear out
+rm -rf /data/tmp/
+mkdir -p /data/tmp/
+
 # /data/persist
 if [[ ! -d /data/persist ]]; then
   sudo cp -r /system/persist /data
diff --git a/userspace/usr/comma/tmpfiles.conf b/userspace/usr/comma/tmpfiles.conf
index 8ee11a1..84e432b 100644
--- a/userspace/usr/comma/tmpfiles.conf
+++ b/userspace/usr/comma/tmpfiles.conf
@@ -21,7 +21,3 @@ d /var/spool 0755 - - -
 d /var/spool/cron/atjobs 0755 - - -
 
 d /var/cache/pollinate 0755 pollinate daemon -
-
-# /home: setup overlay upper and work dirs
-d /tmp/rw/home_upper 0755 - - -
-d /tmp/rw/home_work 0755 - - -