diff --git a/meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend b/meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend
index d1d94ac..b509821 100644
--- a/meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend
@@ -1,9 +1,16 @@
 
 hostname="citadel"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://locale.conf"
+SRC_URI += "\
+    file://locale.conf \
+    file://environment.sh \
+    file://fstab \
+"
 
 do_install_append () {
     install -m 0755 -d ${D}/storage
-    install -m 0655 ${WORKDIR}/locale.conf ${D}${sysconfdir}/locale.conf
+    install -m 0755 -d ${D}${sysconfdir}/profile.d
+    install -m 0644 ${WORKDIR}/locale.conf ${D}${sysconfdir}/locale.conf
+    install -m 0644 ${WORKDIR}/environment.sh ${D}${sysconfdir}/profile.d/environment.sh
+    install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
 }
diff --git a/meta-citadel-distro/recipes-core/base-files/files/environment.sh b/meta-citadel-distro/recipes-core/base-files/files/environment.sh
new file mode 100644
index 0000000..e81b1a0
--- /dev/null
+++ b/meta-citadel-distro/recipes-core/base-files/files/environment.sh
@@ -0,0 +1,4 @@
+export LANG=en_US.UTF-8
+export LC_COLLATE=C
+export XDG_SESSION_TYPE=wayland
+
diff --git a/meta-citadel-distro/recipes-core/base-files/files/fstab b/meta-citadel-distro/recipes-core/base-files/files/fstab
new file mode 100644
index 0000000..239d345
--- /dev/null
+++ b/meta-citadel-distro/recipes-core/base-files/files/fstab
@@ -0,0 +1,8 @@
+/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      ext4       defaults              0  0
+