diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_rtc.c b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_rtc.c
index 41097fe1fb..7d4e37b5c8 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_rtc.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_rtc.c
@@ -9,6 +9,7 @@
  * 2020-10-14   Dozingfiretruck Porting for stm32wbxx
  * 2021-02-05   Meco Man      fix the problem of mixing local time and UTC time
  * 2021-07-05   iysheng       implement RTC framework V2.0
+ * 2025-06-05   RCSN          add local time conversion for get timeval and set stamp
  */
 
 #include "board.h"
@@ -71,8 +72,11 @@ static rt_err_t stm32_rtc_get_timeval(struct timeval *tv)
     tm_new.tm_mon  = RTC_DateStruct.Month - 1;
     tm_new.tm_year = RTC_DateStruct.Year + 100;
 
+#ifdef RT_ALARM_USING_LOCAL_TIME
+    tv->tv_sec = mktime(&tm_new);
+#else
     tv->tv_sec = timegm(&tm_new);
-
+#endif
 #if defined(SOC_SERIES_STM32H7)
     tv->tv_usec = (255.0 - RTC_TimeStruct.SubSeconds * 1.0) / 256.0 * 1000.0 * 1000.0;
 #endif
@@ -85,8 +89,11 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp)
     RTC_TimeTypeDef RTC_TimeStruct = {0};
     RTC_DateTypeDef RTC_DateStruct = {0};
     struct tm tm = {0};
-
+#ifdef RT_ALARM_USING_LOCAL_TIME
+    localtime_r(&time_stamp,&tm);
+#else
     gmtime_r(&time_stamp, &tm);
+#endif
     if (tm.tm_year < 100)
     {
         return -RT_ERROR;
@@ -318,6 +325,11 @@ static rt_err_t stm32_rtc_set_alarm(struct rt_rtc_wkalarm *alarm)
         rtc_device.wkalarm.tm_hour = alarm->tm_hour;
         rtc_device.wkalarm.tm_min = alarm->tm_min;
         rtc_device.wkalarm.tm_sec = alarm->tm_sec;
+        /* must include the year, month, and day */
+        /* as the alarm in RT_ALARM_ONESHOT mode compares the current timestamp with the alarm timestamp */
+        rtc_device.wkalarm.tm_year = alarm->tm_year;
+        rtc_device.wkalarm.tm_mon = alarm->tm_mon;
+        rtc_device.wkalarm.tm_mday = alarm->tm_mday;
         rtc_alarm_time_set(&rtc_device);
     }
     else