diff --git a/device/generic/mkosi.conf b/device/generic/mkosi.conf
index 9e8627b..9c61711 100644
--- a/device/generic/mkosi.conf
+++ b/device/generic/mkosi.conf
@@ -14,12 +14,14 @@ CompressOutput=
 Packages=
     kernel-6.12-generic
     coreutils
+    locales-en
+    procps-ng
     systemd
     systemd-boot
 
 Bootable=yes
 Bootloader=systemd-boot
-#Bootloader=uki
+# Bootloader=uki
 
 Autologin=yes
 RootPassword=root
diff --git a/device/raspberry/rpi5/mkosi.conf b/device/raspberry/rpi5/mkosi.conf
index f9f8987..6dda5d7 100644
--- a/device/raspberry/rpi5/mkosi.conf
+++ b/device/raspberry/rpi5/mkosi.conf
@@ -13,15 +13,15 @@ SectorSize=512
 
 [Content]
 Packages=
-    kernel-6.12-generic
-    raspberrypi-bootloader
     coreutils
     dnf5
-    neovim
     dracut
     iproute2
+    kernel-6.12-generic
     locales-en
+    neovim
     openssh-server
+    raspberrypi-bootloader
     rosa-repos
     systemd
 
diff --git a/device/raspberry/rpi5/mkosi.repart/00-boot.conf b/device/raspberry/rpi5/mkosi.repart/00-boot.conf
index 291457d..abc74b8 100644
--- a/device/raspberry/rpi5/mkosi.repart/00-boot.conf
+++ b/device/raspberry/rpi5/mkosi.repart/00-boot.conf
@@ -2,6 +2,7 @@
 Type=esp
 Label=bootfs
 Format=vfat
-CopyFiles=/boot/firmware:/firmware
+CopyFiles=/boot/firmware:/
+MountPoint=/boot/firmware
 SizeMinBytes=256M
 SizeMaxBytes=256M
diff --git a/device/rockchip/orangepi5/mkosi.conf b/device/rockchip/orangepi5/mkosi.conf
index a03b341..f37fc8b 100644
--- a/device/rockchip/orangepi5/mkosi.conf
+++ b/device/rockchip/orangepi5/mkosi.conf
@@ -20,12 +20,12 @@ CompressOutput=
 # 4k sectors
 SectorSize=512
 
+#kernel-6.1-orangepi
 [Content]
 Packages=
     coreutils
     kernel-6.1-orangepi
     dnf
-    neovim
     dracut
     iproute2
     locales-en
diff --git a/device/rockchip/orangepi5/wrapper.sh b/device/rockchip/orangepi5/wrapper.sh
index 771fdb6..bfe14fe 100644
--- a/device/rockchip/orangepi5/wrapper.sh
+++ b/device/rockchip/orangepi5/wrapper.sh
@@ -2,7 +2,7 @@
 set -x
 
 # Run mkosi with --force option
-#mkosi --force
+mkosi --force
 
 # Check if mkosi ran successfully
 if [ $? -ne 0 ]; then