diff --git a/sources/meta-tsgrain/conf/distro/tsgrain.conf b/sources/meta-tsgrain/conf/distro/tsgrain.conf
index ff4b315..ecdedcf 100644
--- a/sources/meta-tsgrain/conf/distro/tsgrain.conf
+++ b/sources/meta-tsgrain/conf/distro/tsgrain.conf
@@ -30,6 +30,7 @@ PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv"
 ENABLE_UART = "1"
 ENABLE_I2C = "1"
 KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708"
+RPI_EXTRA_CONFIG = "dtoverlay=i2c-rtc,ds3231"
 
 require conf/distro/include/yocto-uninative.inc
 INHERIT += "uninative buildstats sstate license remove-libtool"
diff --git a/sources/meta-tsgrain/recipes-connectivity/hostapd/files/hostapd.service b/sources/meta-tsgrain/recipes-connectivity/hostapd/files/hostapd.service
deleted file mode 100644
index c8fce1e..0000000
--- a/sources/meta-tsgrain/recipes-connectivity/hostapd/files/hostapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/hostapd.pid
-ExecStart=@SBINDIR@/hostapd /app/hostapd/hostapd.conf -P /run/hostapd.pid -B
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources/meta-tsgrain/recipes-connectivity/hostapd/hostapd_%.bbappend b/sources/meta-tsgrain/recipes-connectivity/hostapd/hostapd_%.bbappend
index 424d8e0..b6528c0 100644
--- a/sources/meta-tsgrain/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ b/sources/meta-tsgrain/recipes-connectivity/hostapd/hostapd_%.bbappend
@@ -4,7 +4,7 @@ SRC_URI_append = "\
     file://hostapd.conf \
 "
 
-FILES_${PN} += "/app/hostapd/hostapd.conf"
+FILES_${PN} += "/data/hostapd/hostapd.conf"
 
 SYSTEMD_AUTO_ENABLE_${PN} = "enable"
 
@@ -13,11 +13,11 @@ do_install_append() {
     rm -rf ${D}${sysconfdir}
 
     # Install config file to appfs
-    install -D -m 644 ${WORKDIR}/hostapd.conf ${D}/app/hostapd/hostapd.conf
+    install -D -m 644 ${WORKDIR}/hostapd.conf ${D}/data/hostapd/hostapd.conf
 
     # Change config file path
     install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/
-    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,/app/hostapd,g' ${D}${systemd_unitdir}/system/hostapd.service
+    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,/data/hostapd,g' ${D}${systemd_unitdir}/system/hostapd.service
 }
 
-CONFFILES_${PN} = "/app/hostapd/hostapd.conf"
+CONFFILES_${PN} = "/data/hostapd/hostapd.conf"
diff --git a/sources/meta-tsgrain/recipes-connectivity/openssh/files/sshd_config b/sources/meta-tsgrain/recipes-connectivity/openssh/files/sshd_config
index e734f3f..175c22d 100644
--- a/sources/meta-tsgrain/recipes-connectivity/openssh/files/sshd_config
+++ b/sources/meta-tsgrain/recipes-connectivity/openssh/files/sshd_config
@@ -15,9 +15,9 @@
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 
-HostKey /app/ssh/ssh_host_rsa_key
-HostKey /app/ssh/ssh_host_ecdsa_key
-HostKey /app/ssh/ssh_host_ed25519_key
+HostKey /data/ssh/ssh_host_rsa_key
+HostKey /data/ssh/ssh_host_ecdsa_key
+HostKey /data/ssh/ssh_host_ed25519_key
 
 # Ciphers and keying
 #RekeyLimit default none
diff --git a/sources/meta-tsgrain/recipes-core/base-files/files/fstab b/sources/meta-tsgrain/recipes-core/base-files/files/fstab
index facbb1f..7b80649 100644
--- a/sources/meta-tsgrain/recipes-core/base-files/files/fstab
+++ b/sources/meta-tsgrain/recipes-core/base-files/files/fstab
@@ -7,4 +7,4 @@ tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,stri
 tmpfs                /var/volatile        tmpfs      defaults              0  0
 
 /dev/mmcblk0p1  /boot   vfat    defaults        0       0
-/dev/mmcblk0p4  /app    ext4    defaults        0       0
+/dev/mmcblk0p4  /data   ext4    defaults        0       0
diff --git a/sources/meta-tsgrain/recipes-core/images/tsgrain-image.bb b/sources/meta-tsgrain/recipes-core/images/tsgrain-image.bb
index 9bb3512..c436d37 100644
--- a/sources/meta-tsgrain/recipes-core/images/tsgrain-image.bb
+++ b/sources/meta-tsgrain/recipes-core/images/tsgrain-image.bb
@@ -8,6 +8,7 @@ IMAGE_INSTALL = "\
     curl \
     python3 \
     i2c-tools \
+    rauc-grow-data-part \
     sebrauc \
 "
 
diff --git a/sources/meta-tsgrain/recipes-core/rauc/files/rauc-grow-data-partition.service b/sources/meta-tsgrain/recipes-core/rauc/files/rauc-grow-data-partition.service
index bcba29b..bbc7d3a 100644
--- a/sources/meta-tsgrain/recipes-core/rauc/files/rauc-grow-data-partition.service
+++ b/sources/meta-tsgrain/recipes-core/rauc/files/rauc-grow-data-partition.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Service to grow data partition size
 DefaultDependencies=no
-Before=home.mount
+Before=data.mount
 
 [Service]
 Type=oneshot
@@ -9,4 +9,4 @@ RemainAfterExit=yes
 ExecStart=/usr/sbin/parted --script /dev/mmcblk0 resizepart 4 100%
 
 [Install]
-WantedBy=home.mount
+WantedBy=data.mount
diff --git a/sources/meta-tsgrain/wic/sdimage-tsgrain.wks b/sources/meta-tsgrain/wic/sdimage-tsgrain.wks
index 722f99d..724b7c1 100644
--- a/sources/meta-tsgrain/wic/sdimage-tsgrain.wks
+++ b/sources/meta-tsgrain/wic/sdimage-tsgrain.wks
@@ -1,4 +1,4 @@
 part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 100
 part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_A --align 4096
 part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label rootfs_B --align 4096
-part /app --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/app --ondisk mmcblk0 --fstype=ext4 --label appfs --align 1024 --size 500 --fsoptions "x-systemd.growfs"
+part /data --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/data --ondisk mmcblk0 --fstype=ext4 --label appfs --align 1024 --size 500