diff --git a/dependencies.yaml b/dependencies.yaml
index b034c04b6..5bb27d9e5 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -60,7 +60,7 @@ libevse-security:
 # OCPP
 libocpp:
   git: https://github.com/EVerest/libocpp.git
-  git_tag: v0.15.0
+  git_tag: 398f0c5e3465d49a27524d708a8e8281461e69fa
   cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP"
 # Josev
 Josev:
diff --git a/modules/OCPP/OCPP.cpp b/modules/OCPP/OCPP.cpp
index 7fad97a52..8a6dc0972 100644
--- a/modules/OCPP/OCPP.cpp
+++ b/modules/OCPP/OCPP.cpp
@@ -577,10 +577,13 @@ void OCPP::ready() {
         types::system::FirmwareUpdateRequest firmware_update_request;
         firmware_update_request.request_id = msg.requestId;
         firmware_update_request.location = msg.firmware.location;
-        firmware_update_request.retrieve_timestamp.emplace(msg.firmware.retrieveDateTime.to_rfc3339());
         firmware_update_request.signature.emplace(msg.firmware.signature.get());
         firmware_update_request.signing_certificate.emplace(msg.firmware.signingCertificate.get());
 
+        if (msg.firmware.retrieveDateTime.has_value()) {
+            firmware_update_request.retrieve_timestamp.emplace(msg.firmware.retrieveDateTime.value().to_rfc3339());
+        }
+
         if (msg.firmware.installDateTime.has_value()) {
             firmware_update_request.install_timestamp.emplace(msg.firmware.installDateTime.value());
         }
diff --git a/modules/OCPP/auth_validator/auth_token_validatorImpl.cpp b/modules/OCPP/auth_validator/auth_token_validatorImpl.cpp
index e10cd02f0..cc121f471 100644
--- a/modules/OCPP/auth_validator/auth_token_validatorImpl.cpp
+++ b/modules/OCPP/auth_validator/auth_token_validatorImpl.cpp
@@ -3,7 +3,7 @@
 #include "auth_token_validatorImpl.hpp"
 #include <conversions.hpp>
 #include <ocpp/common/types.hpp>
-#include <ocpp/v16/enums.hpp>
+#include <ocpp/v16/ocpp_enums.hpp>
 #include <ocpp/v201/ocpp_types.hpp>
 
 namespace module {
diff --git a/modules/OCPP/error_mapping.hpp b/modules/OCPP/error_mapping.hpp
index da49f3ee3..ac64c4768 100644
--- a/modules/OCPP/error_mapping.hpp
+++ b/modules/OCPP/error_mapping.hpp
@@ -5,7 +5,7 @@
 
 #include <unordered_map>
 
-#include <ocpp/v16/enums.hpp>
+#include <ocpp/v16/ocpp_enums.hpp>
 
 namespace module {