diff --git a/src/drivers/boards/common/stm32/board_reset.c b/src/drivers/boards/common/stm32/board_reset.c
index efeb1293cc75..a8e0dc0a12f3 100644
--- a/src/drivers/boards/common/stm32/board_reset.c
+++ b/src/drivers/boards/common/stm32/board_reset.c
@@ -40,6 +40,7 @@
 #include <px4_config.h>
 #include <errno.h>
 #include <stm32_pwr.h>
+#include <stm32_rtc.h>
 #include <nuttx/board.h>
 
 
@@ -61,7 +62,13 @@ int board_set_bootload_mode(board_reset_e mode)
 	}
 
 	stm32_pwr_enablebkp(true);
+
+// Check if we can to use the new register definition
+#ifndef STM32_RTC_BK0R
 	*(uint32_t *)STM32_BKP_BASE = regvalue;
+#else
+	*(uint32_t *)STM32_RTC_BK0R = regvalue;
+#endif
 	stm32_pwr_enablebkp(false);
 	return OK;
 }
diff --git a/src/platforms/px4_micro_hal.h b/src/platforms/px4_micro_hal.h
index d5064083675a..3ac265e7582b 100644
--- a/src/platforms/px4_micro_hal.h
+++ b/src/platforms/px4_micro_hal.h
@@ -68,6 +68,7 @@ __BEGIN_DECLS
 
 #    if defined(CONFIG_ARCH_CHIP_STM32F7)
 #      include <chip.h>
+#      include <up_internal.h> //include up_systemreset() which is included on stm32.h
 #      include <stm32_bbsram.h>
 #      define PX4_BBSRAM_SIZE STM32F7_BBSRAM_SIZE
 #      define PX4_BBSRAM_GETDESC_IOCTL STM32F7_BBSRAM_GETDESC_IOCTL