diff --git a/src/utils.cpp b/src/utils.cpp
index eb2492c..8eb2695 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -733,9 +733,10 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
     const auto& server_mode     = std::get<std::int32_t>(config_data["SERVER_MODE"]);
     const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]);
 
-    const auto& root_filesystem  = utils::get_mountpoint_fs(mountpoint_info);
-    const auto& is_root_on_zfs   = (root_filesystem == "zfs");
-    const auto& is_root_on_btrfs = (root_filesystem == "btrfs");
+    const auto& root_filesystem     = utils::get_mountpoint_fs(mountpoint_info);
+    const auto& is_root_on_zfs      = (root_filesystem == "zfs");
+    const auto& is_root_on_btrfs    = (root_filesystem == "btrfs");
+    const auto& is_root_on_bcachefs = (root_filesystem == "bcachefs");
 
     auto pkg_list = utils::make_multiline(packages, false, ' ');
 
@@ -750,6 +751,9 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
     if (is_root_on_zfs) {
         pkg_list.insert(pkg_list.cend(), {"zfs-utils"});
     }
+    if (is_root_on_bcachefs) {
+        pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"});
+    }
     if (server_mode == 0) {
         if (is_root_on_btrfs) {
             pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"});
@@ -765,7 +769,8 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
         pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"});
     }
     pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"});
-    pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"});
+    pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "linux-firmware", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"});
+    pkg_list.insert(pkg_list.cend(), {"man-db", "less"});
     pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"});
 
     return pkg_list;