diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index b7a84159..d37673fc 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -111,6 +111,9 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   dataOffset += 6;
   coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  if(firstHk) {
+    triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value);
+  }
   dataOffset += 6;
   auxHk.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
                  *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index 4f5589b6..d08a46e0 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -14,10 +14,12 @@ class P60DockHandler : public GomspaceDeviceHandler {
  public:
   static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::P60_DOCK_HANDLER;
 
+  //! [EXPORT] : [COMMENT] P60 boot count is broadcasted once at SW startup. P1: Boot count
+  static constexpr Event P60_BOOT_COUNT = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
   //! [EXPORT] : [COMMENT] Battery mode is broadcasted at startup. P1: Mode
-  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
+  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 1, severity::INFO);
   //! [EXPORT] : [COMMENT] Battery mode has changed. P1: Old mode. P2: New mode
-  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 1, severity::MEDIUM);
+  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 2, severity::MEDIUM);
 
   P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
   virtual ~P60DockHandler();