diff --git a/modules/CbSystem/main/systemImpl.cpp b/modules/CbSystem/main/systemImpl.cpp
index c632e98..6d1050f 100644
--- a/modules/CbSystem/main/systemImpl.cpp
+++ b/modules/CbSystem/main/systemImpl.cpp
@@ -142,6 +142,9 @@ static std::string get_partition(PartitionType part_type) {
 }
 
 void systemImpl::ready() {
+    // TODO: Remove this sleep when fix of the issues (ref: https://github.com/EVerest/libocpp/issues/758,
+    // https://github.com/EVerest/everest-core/issues/841) are implemented
+    sleep(20);
     check_update_marker();
 }
 
diff --git a/modules/CbSystem/main/systemImpl.hpp b/modules/CbSystem/main/systemImpl.hpp
index f191411..e1d63a3 100644
--- a/modules/CbSystem/main/systemImpl.hpp
+++ b/modules/CbSystem/main/systemImpl.hpp
@@ -139,6 +139,10 @@ class systemImpl : public systemImplBase {
     void install_signed_firmware(const types::system::FirmwareUpdateRequest& firmware_update_reqeust,
                                  const std::filesystem::path& firmware_file_path);
 
+    /**
+     *  @brief Checks if the firmware update marker is present and if so, 
+     *  notify the upper layer that the firmware update was successfuly installed.
+     */
     void check_update_marker();
     // ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
 };