diff --git a/buildroot-external/board/nabucasa/green/kernel.config b/buildroot-external/board/nabucasa/green/kernel.config
index 43c181dc..700b8226 100644
--- a/buildroot-external/board/nabucasa/green/kernel.config
+++ b/buildroot-external/board/nabucasa/green/kernel.config
@@ -11,4 +11,18 @@ CONFIG_MMC_SDHCI_OF_DWCMSHC=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_RK860X=y
 
-# CONFIG_DW_WATCHDOG is not set
+CONFIG_DW_WATCHDOG=y
+
+# CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is not set
+# CONFIG_WATCHDOG_OPEN_TIMEOUT is not set
+# CONFIG_WATCHDOG_SYSFS is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_BD957XMUF_WATCHDOG is not set
+# CONFIG_RAVE_SP_WATCHDOG is not set
+# CONFIG_RN5T618_WATCHDOG is not set
+# CONFIG_SUNXI_WATCHDOG is not set
+# CONFIG_TEGRA_WATCHDOG is not set
+# CONFIG_HP_WATCHDOG is not set
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+# CONFIG_USBPCWATCHDOG is not set
diff --git a/buildroot-external/board/nabucasa/green/uboot-boot.ush b/buildroot-external/board/nabucasa/green/uboot-boot.ush
index 47b03ccc..999e1eb3 100755
--- a/buildroot-external/board/nabucasa/green/uboot-boot.ush
+++ b/buildroot-external/board/nabucasa/green/uboot-boot.ush
@@ -28,8 +28,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 rootwait net.naming-scheme=v250 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=ext4 rw"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=ext4 rw"
 
 part number ${devtype} ${devnum} hassos-boot boot_partnum
 
diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config
index 3fc6ab3e..157ae375 100644
--- a/buildroot-external/bootloader/uboot.config
+++ b/buildroot-external/bootloader/uboot.config
@@ -3,7 +3,7 @@ CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_EXPERT is not set
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOOTDELAY=-2
+CONFIG_BOOTDELAY=3
 CONFIG_SYS_PROMPT="HAOS> "
 # CONFIG_ISO_PARTITION is not set
 CONFIG_EFI_PARTITION=y
diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config
index 68dc92cc..d76d0b08 100644
--- a/buildroot-external/busybox.config
+++ b/buildroot-external/busybox.config
@@ -501,7 +501,7 @@ CONFIG_GREP=y
 # CONFIG_FEATURE_WAIT_FOR_INIT is not set
 # CONFIG_FEATURE_CALL_TELINIT is not set
 CONFIG_TELINIT_PATH=""
-# CONFIG_INIT is not set
+CONFIG_INIT=y
 # CONFIG_LINUXRC is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
 # CONFIG_FEATURE_KILL_REMOVED is not set
@@ -537,8 +537,8 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
 # CONFIG_DELUSER is not set
 # CONFIG_DELGROUP is not set
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
 # CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 # CONFIG_FEATURE_NOLOGIN is not set
diff --git a/buildroot-external/configs/green_defconfig b/buildroot-external/configs/green_defconfig
index 6c5658d0..8419cee1 100755
--- a/buildroot-external/configs/green_defconfig
+++ b/buildroot-external/configs/green_defconfig
@@ -12,7 +12,9 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="homeassistant"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant"
-BR2_INIT_SYSTEMD=y
+BR2_INIT_BUSYBOX=y
+# BR2_INIT_SYSV is not set
+# BR2_INIT_SYSTEMD is not set
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
@@ -94,19 +96,22 @@ BR2_PACKAGE_PROCPS_NG=y
 BR2_PACKAGE_RAUC=y
 BR2_PACKAGE_RAUC_DBUS=y
 BR2_PACKAGE_RAUC_NETWORK=y
-BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y
-BR2_PACKAGE_SYSTEMD_COREDUMP=y
+# BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE is not set
+# BR2_PACKAGE_SYSTEMD_COREDUMP is not set
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
-BR2_PACKAGE_SYSTEMD_LOGIND=y
+# BR2_PACKAGE_SYSTEMD_LOGIND is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
-BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
+# BR2_PACKAGE_SYSTEMD_RANDOMSEED is not set
 BR2_PACKAGE_UTIL_LINUX_LOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_UTIL_LINUX_SULOGIN=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="800M"
+# BR2_TARGET_ROOTFS_SQUASHFS is not set
+# BR2_TARGET_ROOTFS_SQUASHFS4_LZ4 is not set
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -146,3 +151,7 @@ BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
 BR2_PACKAGE_UDISKS2=y
 BR2_PACKAGE_V4L2LOOPBACK=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_OPENSSH_SERVER=y
+BR2_PACKAGE_OPENSSH_KEY_UTILS=y
+BR2_TARGET_GENERIC_ROOT_PASSWD="root"
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system.conf.d/watchdog.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system.conf.d/watchdog.conf
index 8f664741..035cfa35 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system.conf.d/watchdog.conf
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system.conf.d/watchdog.conf
@@ -1,3 +1,3 @@
 [Manager]
-RuntimeWatchdogSec=default
-WatchdogDevice=/dev/watchdog
+#RuntimeWatchdogSec=default
+#WatchdogDevice=/dev/watchdog
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index fe1d377c..1440d8e9 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -11,7 +11,7 @@ OVERLAY_UUID="f1326040-5236-40eb-b683-aaa100a9afcf"
 DATA_UUID="a52a4597-fa3a-4851-aefd-2fbe9f849079"
 
 BOOTSTATE_SIZE=8M
-SYSTEM_SIZE=256M
+SYSTEM_SIZE=800M
 KERNEL_SIZE=24M
 OVERLAY_SIZE=96M
 DATA_SIZE=1280M
@@ -114,7 +114,7 @@ function _create_disk_gpt() {
     local data_img="$(path_data_img)"
     local kernel_img="$(path_kernel_img)"
     local hdd_img="$(hassos_image_name img)"
-    local hdd_count=${DISK_SIZE:-2}
+    local hdd_count=${DISK_SIZE:-3}
 
     local boot_offset=0
     local rootfs_offset=0
@@ -197,7 +197,7 @@ function _create_disk_mbr() {
     local data_img="$(path_data_img)"
     local kernel_img="$(path_kernel_img)"
     local hdd_img="$(hassos_image_name img)"
-    local hdd_count=${DISK_SIZE:-2}
+    local hdd_count=${DISK_SIZE:-3}
     local disk_layout="${BINARIES_DIR}/disk.layout"
 
     # All boards with MBR disk layout have SPL
diff --git a/buildroot-external/scripts/name.sh b/buildroot-external/scripts/name.sh
index 33ccf1be..6d79cf82 100755
--- a/buildroot-external/scripts/name.sh
+++ b/buildroot-external/scripts/name.sh
@@ -41,6 +41,6 @@ function path_overlay_img() {
 }
 
 function path_rootfs_img() {
-    echo "${BINARIES_DIR}/rootfs.squashfs"
+    echo "${BINARIES_DIR}/rootfs.ext4"
 }
 
diff --git a/buildroot-external/scripts/post-build.sh b/buildroot-external/scripts/post-build.sh
index 2ad3de6a..3c3bee26 100755
--- a/buildroot-external/scripts/post-build.sh
+++ b/buildroot-external/scripts/post-build.sh
@@ -46,4 +46,4 @@ install_rauc_certs
 install_bootloader_config
 
 # Fix overlay presets
-"${HOST_DIR}/bin/systemctl" --root="${TARGET_DIR}" preset-all
+#"${HOST_DIR}/bin/systemctl" --root="${TARGET_DIR}" preset-all
diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh
index 3f91a710..7ca06e53 100755
--- a/buildroot-external/scripts/rootfs-layer.sh
+++ b/buildroot-external/scripts/rootfs-layer.sh
@@ -20,13 +20,13 @@ function fix_rootfs() {
     rm -f "${TARGET_DIR}/usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service"
 
     # Fix: tempfs with /srv
-    sed -i "/srv/d" "${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf"
+#    sed -i "/srv/d" "${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf"
 
     # Fix: Could not generate persistent MAC address
-    sed -i "s/MACAddressPolicy=persistent/MACAddressPolicy=none/g" "${TARGET_DIR}/usr/lib/systemd/network/99-default.link"
+#    sed -i "s/MACAddressPolicy=persistent/MACAddressPolicy=none/g" "${TARGET_DIR}/usr/lib/systemd/network/99-default.link"
 
     # Use systemd-resolved for Host OS resolve
-    sed -i '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' "${TARGET_DIR}/etc/nsswitch.conf"
+#    sed -i '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' "${TARGET_DIR}/etc/nsswitch.conf"
 
     # Remove e2scrub (LVM specific tools provided by e2fsprogs)
     rm -f "/usr/lib/systemd/system/e2scrub*"