diff --git a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.cpp b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.cpp
index 203f3d24a..7dc9c8635 100644
--- a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.cpp
+++ b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.cpp
@@ -16,44 +16,44 @@
 // Digital PinName array
 const PinName digitalPin[] = {
   PA_0,   // D0
-  PA_1,   // D1 - SPI1_SCK
-  PA_2,   // D2 - USART2_TX
-  PA_3,   // D3 - USART2_RX
-  PA_4,   // D4 - SPI_NSS
-  PA_5,   // D5 - SPI_SCK
-  PA_6,   // D6 - SPI_MISO
-  PA_7,   // D7 - SPI_MOSI
+  PA_1,   // D1
+  PA_2,   // D2     - USART2/LPUART1 TX
+  PA_3,   // D3     - USART2/LPUART1 RX
+  PA_4,   // D4     - SPI_NSS
+  PA_5,   // D5     - SPI_SCK
+  PA_6,   // D6     - SPI_MISO
+  PA_7,   // D7     - SPI_MOSI
   PA_8,   // D8
   PA_9,   // D9
-  PA_10,  // D10/A0
-  PA_11,  // D11    - I2C_SDA
-  PA_12,  // D12    - I2C_SCL
-  PA_13,  // D13/A1 - SWDIO
-  PA_14,  // D14/A2 - SWCLK
-  PB_1,   // D15/A3
-  PB_2,   // D16/A4
-  PB_3,   // D17/A5
-  PB_4,   // D18/A6
+  PA_10,  // D10/A3
+  PA_11,  // D11/A7 - I2C_SDA
+  PA_12,  // D12/A8 - I2C_SCL
+  PA_13,  // D13/A5 - SWDIO
+  PA_14,  // D14/A6 - SWCLK
+  PA_15,  // D15/A4
+  PB_2,   // D16/A2
+  PB_3,   // D17/A0
+  PB_4,   // D18/A1
   PB_5,   // D19
-  PB_6,   // D20 - USART1_TX
-  PB_7,   // D21 - USAR1_RX
+  PB_6,   // D20    - USART1_TX
+  PB_7,   // D21    - USAR1_RX
   PB_8,   // D22
   PB_12,  // D23
-  PB_14,  // D24/A7
-  PC_13,  // D25
-  PH_3    // D26 - BOOT0
+  PC_13,  // D24
+  PH_3    // D25    - BOOT0
 };
 
 // Analog (Ax) pin number array
 const uint32_t analogInputPin[] = {
-  10, // A0,  PA10
-  13, // A1,  PA13
-  14, // A2,  PA14
-  15, // A3,  PB1
-  16, // A4,  PB2
-  17, // A5,  PB3
-  18, // A6,  PB4
-  24, // A7,  PB14
+  17, // A0,  PB3
+  18, // A1,  PB4
+  16, // A2,  PB2
+  10, // A3,  PA10
+  15, // A4,  PA15
+  13, // A5,  PA13
+  14, // A6,  PA14
+  11, // A7,  PA11
+  12  // A8,  PA12
 };
 
 // ----------------------------------------------------------------------------
diff --git a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h
index 3bc956526..3ea5fdb7c 100644
--- a/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h
+++ b/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h
@@ -25,23 +25,27 @@
 #define PA7                     7
 #define PA8                     8
 #define PA9                     9
-#define PA10                    PIN_A0
-#define PA11                    11
-#define PA12                    12
-#define PA13                    PIN_A1
-#define PA14                    PIN_A2
-#define PB1                     PIN_A3
-#define PB2                     PIN_A4
-#define PB3                     PIN_A5
-#define PB4                     PIN_A6
+#define PA10                    PIN_A3
+#define PA11                    PIN_A7
+#define PA12                    PIN_A8
+#define PA13                    PIN_A5
+#define PA14                    PIN_A6
+#define PA15                    PIN_A4
+#define PB2                     PIN_A2
+#define PB3                     PIN_A0
+#define PB4                     PIN_A1
 #define PB5                     19
 #define PB6                     20
 #define PB7                     21
 #define PB8                     22
 #define PB12                    23
-#define PB14                    PIN_A7
-#define PC13                    25
-#define PH3                     26
+#define PC13                    24
+#define PH3                     25
+
+// Not available
+// PB0
+// PC14
+// PC15
 
 // Alternate pins number
 #define PA1_ALT1                (PA1 | ALT1)
@@ -53,8 +57,8 @@
 #define PA7_ALT1                (PA7 | ALT1)
 #define PB8_ALT1                (PB8 | ALT1)
 
-#define NUM_DIGITAL_PINS        27
-#define NUM_ANALOG_INPUTS       8
+#define NUM_DIGITAL_PINS        26
+#define NUM_ANALOG_INPUTS       9
 
 // On-board LED pin number
 #ifndef LED_BUILTIN