diff --git a/meta-citadel-distro/recipes-core/base-files/files/fstab b/meta-citadel-distro/recipes-core/base-files/files/fstab
index 558544d..1fe3904 100644
--- a/meta-citadel-distro/recipes-core/base-files/files/fstab
+++ b/meta-citadel-distro/recipes-core/base-files/files/fstab
@@ -1,8 +1,7 @@
-/dev/root            /                    auto       defaults              1  1
-proc                 /proc                proc       defaults              0  0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
-tmpfs                /var/volatile        tmpfs      defaults              0  0
-
-/dev/mapper/citadel-storage /storage      btrfs       defaults              0  0
+/dev/root                           /                    auto       defaults              1  1
+tmpfs                               /var                 tmpfs      defaults              0  0
+/dev/mapper/citadel-storage         /storage             auto       defaults              0  0
 
+/storage/citadel-state/home         /home                none       bind                  0  0
+/storage/citadel-state/var/log      /var/log             none       bind                  0  0
+/storage/citadel-state/etc/NetworkManager/system-connections /etc/NetworkManager/system-connections none bind 0 0