diff --git a/targets/TARGET_STM/sleep.c b/targets/TARGET_STM/sleep.c
index 3eda86a1e6..c67ec95e38 100644
--- a/targets/TARGET_STM/sleep.c
+++ b/targets/TARGET_STM/sleep.c
@@ -192,6 +192,10 @@ __WEAK void hal_deepsleep(void)
         HAL_PWREx_DisableLowPowerRunMode();
     }
 
+#if defined(PWR_CR1_RRSTP)
+    HAL_PWREx_EnableSRAM3ContentRetention();
+#endif
+
     HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
 
     if (lowPowerModeEnabled) {
diff --git a/targets/targets.json b/targets/targets.json
index a2458619ad..da92657ced 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -3290,11 +3290,7 @@
         "device_has_add": [
             "USBDEVICE"
         ],
-        "device_name": "STM32L4R5ZI",
-        "mbed_rom_start": "0x08000000",
-        "mbed_rom_size": "0x200000",
-        "mbed_ram_start": "0x20000000",
-        "mbed_ram_size": "0x40000"
+        "device_name": "STM32L4R5ZITx"
     },
     "NUCLEO_L4R5ZI_P": {
         "inherits": [
@@ -3308,6 +3304,7 @@
         "inherits": [
             "MCU_STM32L4"
         ],
+        "device_name": "STM32L4R9AIIx",
         "supported_form_factors": [
             "ARDUINO",
             "STMOD",
@@ -3330,11 +3327,7 @@
         "device_has_add": [
             "QSPI",
             "USBDEVICE"
-        ],
-        "mbed_rom_start": "0x08000000",
-        "mbed_rom_size": "0x200000",
-        "mbed_ram_start": "0x20000000",
-        "mbed_ram_size": "0x40000"
+        ]
     },
    "B_L4S5I_IOT01A": {
         "inherits": [