diff --git a/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h
index d220592e90..dff7098db2 100644
--- a/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h
+++ b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h
@@ -3074,7 +3074,7 @@ __STATIC_INLINE void LL_RTC_BKP_SetRegister(TAMP_TypeDef *TAMPx, uint32_t Backup
   */
 __STATIC_INLINE uint32_t LL_RTC_BKP_GetRegister(TAMP_TypeDef *TAMPx, uint32_t BackupRegister)
 {
-  const register __IO uint32_t *tmp;
+  register __IO uint32_t *tmp;
 
   tmp = &(TAMPx->BKP0R) + BackupRegister;
 
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h
index 902354bbc1..5f3e73f3d6 100644
--- a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h
+++ b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h
@@ -155,7 +155,6 @@ typedef enum {
     D10         = PB_9,
     D11         = PB_5,
     D12         = PB_4,
-    D13         = PB_3,
 
     // STDIO for console print
 #ifdef MBED_CONF_TARGET_STDIO_UART_TX
diff --git a/targets/TARGET_STM/TARGET_STM32G0/serial_device.c b/targets/TARGET_STM/TARGET_STM32G0/serial_device.c
index 41cd3a6993..4e586550fa 100644
--- a/targets/TARGET_STM/TARGET_STM32G0/serial_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G0/serial_device.c
@@ -24,7 +24,6 @@
 #define USART3_4_LPUART1_IRQn LPUART1_IRQn
 #endif
 
-
 uint32_t serial_irq_ids[UART_NUM] = {0};
 UART_HandleTypeDef uart_handlers[UART_NUM];
 
diff --git a/targets/targets.json b/targets/targets.json
index da5d384b9b..6f3012db7d 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2403,16 +2403,25 @@
         ],
         "device_name": "STM32G071RBTx"
     },
-    "NUCLEO_G031K8": {
+    "MCU_STM32G031xx": {
         "inherits": [
             "MCU_STM32G0"
         ],
+        "public": false,
         "extra_labels_add": [
             "STM32G031xx"
         ],
         "macros_add": [
             "STM32G031xx"
         ],
+        "device_has_remove": [
+            "ANALOGOUT"
+        ]
+    },
+    "NUCLEO_G031K8": {
+        "inherits": [
+            "MCU_STM32G031xx"
+        ],
         "detect_code": [
             "0852"
         ],