diff --git a/build-image.sh b/build-image.sh
index 05de6c85..0b50dcae 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -151,11 +151,10 @@ Subsystem	sftp	/usr/lib/ssh/sftp-server
 " > /etc/ssh/sshd_config
 
 echo "
-LABEL=frzr_root /          btrfs subvol=deployments/${SYSTEM_NAME}-${VERSION},ro,noatime,nodatacow 0 0
-LABEL=frzr_root /var       btrfs subvol=var,rw,noatime,nodatacow 0 0
-LABEL=frzr_root /home      btrfs subvol=home,rw,noatime,nodatacow 0 0
-LABEL=frzr_root /frzr_root btrfs subvol=/,rw,noatime,nodatacow 0 0
-LABEL=frzr_efi  /boot      vfat  rw,noatime,nofail  0 0
+LABEL=frzr_root /var       btrfs     defaults,subvolid=256,rw,noatime,nodatacow                                                                           0   0
+LABEL=frzr_root /home      btrfs     defaults,subvolid=257,rw,noatime,nodatacow                                                                           0   0
+LABEL=frzr_root /frzr_root btrfs     defaults,subvolid=5,rw,noatime,nodatacow,x-initrd                                                                    0   2
+overlayfs       /etc       overlayfs defaults,x-depends-on=/frzr_root,lowerdir=/etc,upperdir=/frzr_root/etc,workdir=/frzr_root/.etc,comment=etcoverlay    0   2
 " > /etc/fstab
 
 echo "
@@ -208,9 +207,10 @@ rm -rf \
 rm -rf ${FILES_TO_DELETE}
 
 # create necessary directories
-mkdir /home
-mkdir /var
-mkdir /frzr_root
+mkdir -p /home
+mkdir -p /var
+mkdir -p /frzr_root
+mkdir -p /efi
 EOF
 
 #defrag the image
diff --git a/rootfs/etc/mkinitcpio.conf b/rootfs/etc/mkinitcpio.conf
index 4fdef1e3..55abe136 100644
--- a/rootfs/etc/mkinitcpio.conf
+++ b/rootfs/etc/mkinitcpio.conf
@@ -3,6 +3,6 @@
 MODULES=(dm_mod ext4 sha256 sha512 overlay)
 BINARIES=()
 FILES=()
-HOOKS=(base microcode udev modconf kms block keyboard keymap filesystems fsck frzr-etc)
+HOOKS=(microcode systemd modconf kms keyboard sd-vconsole block filesystems fsck)
 COMPRESSION="xz"
 COMPRESSION_OPTIONS=(-v -9e)
diff --git a/rootfs/etc/vconsole.conf b/rootfs/etc/vconsole.conf
new file mode 100644
index 00000000..f20166b6
--- /dev/null
+++ b/rootfs/etc/vconsole.conf
@@ -0,0 +1,7 @@
+# keyboard keymap in initramfs: get the list of supported keymaps using:
+# localectl keymap-list
+KEYMAP=us
+
+# console font in initramfs: get the list of supported fonts using:
+# ls -l /usr/share/kbd/consolefonts/ | grep -i ".psfu.gz"
+FONT=iso01-12x22
\ No newline at end of file