diff --git a/matter/si91x/siwx917/BRD4338A/autogen/RTE_Components.h b/matter/si91x/siwx917/BRD4338A/autogen/RTE_Components.h
index 2c64163d90..4412235e51 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/RTE_Components.h
+++ b/matter/si91x/siwx917/BRD4338A/autogen/RTE_Components.h
@@ -1,14 +1,14 @@
 // This file is autogenerated by Simplicity Configuration Tools.
-// The contents of this file will be replaced in their entirety upon regeneration.
-// 
+// The contents of this file will be replaced in their entirety upon
+// regeneration.
+//
 // Source template file: RTE_Components.h.jinja
 
-
 #ifndef RTE_COMPONENTS_H
 #define RTE_COMPONENTS_H
 
 /* standard device header from emlib */
-#define CMSIS_device_header        "em_device.h"
+#define CMSIS_device_header "em_device.h"
 
 /* components are auto-generated here */
 
@@ -24,11 +24,10 @@
 
 #define RTE_RTOS_FreeRTOS_HEAP_3
 
-
 #endif /* RTE_COMPONENTS_H */
 
 /* This file is autogenerated by Simplicity Configuration Tools. */
-/* The contents of this file will be replaced in their entirety upon regeneration. */
+/* The contents of this file will be replaced in their entirety upon
+ * regeneration. */
 /*  */
 /* Source template file: RTE_Components.h.jinja */
-
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h b/matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h
index c8c2836739..71d5215ddb 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_component_catalog.h
@@ -1,35 +1,31 @@
-#ifndef SL_COMPONENT_CATALOG_H
-#define SL_COMPONENT_CATALOG_H
-
-// APIs present in project
-#define SL_CATALOG_BTN0_PRESENT
-#define SL_CATALOG_SIMPLE_BUTTON_PRESENT
-#define SL_CATALOG_SIMPLE_BUTTON_BTN0_PRESENT
-#define SL_CATALOG_BTN1_PRESENT
-#define SL_CATALOG_SIMPLE_BUTTON_BTN1_PRESENT
-#define SL_CATALOG_LED0_PRESENT
-#define SL_CATALOG_SIMPLE_LED_PRESENT
-#define SL_CATALOG_SIMPLE_LED_LED0_PRESENT
-#define SL_CATALOG_LED1_PRESENT
-#define SL_CATALOG_SIMPLE_LED_LED1_PRESENT
-#define SL_CATALOG_ULP_TIMER_PRESENT
-#define SL_CATALOG_ULP_TIMER_TIMER0_PRESENT
-#define SL_CATALOG_CMSIS_OS_COMMON_PRESENT
-#define SL_CATALOG_DEVICE_INIT_NVIC_PRESENT
-#define SL_CATALOG_EMLIB_CORE_PRESENT
-#define SL_CATALOG_EMLIB_CORE_DEBUG_CONFIG_PRESENT
-#define SL_CATALOG_FREERTOS_KERNEL_PRESENT
-#define SL_CATALOG_KERNEL_PRESENT
-#define SL_CATALOG_IOSTREAM_PRESENT
-#define SL_CATALOG_MEMORY_MANAGER_PRESENT
-#define SL_CATALOG_NVM3_PRESENT
-#define SL_CATALOG_SEGGER_RTT_PRESENT
-#if defined(DISPLAY_ENABLED) || defined(SL_ICD_ENABLED)
-#define SL_CATALOG_SLEEPTIMER_PRESENT
-#ifdef DISPLAY_ENABLED
-#define SL_CATALOG_DMD_MEMLCD_PRESENT
-#define SL_CATALOG_GLIB_PRESENT
-#endif // DISPLAY_ENABLED
-#endif // DISPLAY_ENABLED || SL_ICD_ENABLED
-
-#endif // SL_COMPONENT_CATALOG_H
+#ifndef SL_COMPONENT_CATALOG_H
+#define SL_COMPONENT_CATALOG_H
+
+// APIs present in project
+#define SL_CATALOG_BTN0_PRESENT
+#define SL_CATALOG_SIMPLE_BUTTON_PRESENT
+#define SL_CATALOG_SIMPLE_BUTTON_BTN0_PRESENT
+#define SL_CATALOG_BTN1_PRESENT
+#define SL_CATALOG_SIMPLE_BUTTON_BTN1_PRESENT
+#define SL_CATALOG_LED0_PRESENT
+#define SL_CATALOG_SIMPLE_LED_PRESENT
+#define SL_CATALOG_SIMPLE_LED_LED0_PRESENT
+#define SL_CATALOG_LED1_PRESENT
+#define SL_CATALOG_SIMPLE_LED_LED1_PRESENT
+#define SL_CATALOG_ULP_TIMER_PRESENT
+#define SL_CATALOG_ULP_TIMER_TIMER0_PRESENT
+#define SL_CATALOG_CMSIS_OS_COMMON_PRESENT
+#define SL_CATALOG_DEVICE_INIT_NVIC_PRESENT
+#define SL_CATALOG_DMD_MEMLCD_PRESENT
+#define SL_CATALOG_EMLIB_CORE_PRESENT
+#define SL_CATALOG_EMLIB_CORE_DEBUG_CONFIG_PRESENT
+#define SL_CATALOG_FREERTOS_KERNEL_PRESENT
+#define SL_CATALOG_KERNEL_PRESENT
+#define SL_CATALOG_GLIB_PRESENT
+#define SL_CATALOG_IOSTREAM_PRESENT
+#define SL_CATALOG_MEMORY_MANAGER_PRESENT
+#define SL_CATALOG_NVM3_PRESENT
+#define SL_CATALOG_SEGGER_RTT_PRESENT
+#define SL_CATALOG_SLEEPTIMER_PRESENT
+
+#endif // SL_COMPONENT_CATALOG_H
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c b/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c
index d38f61fd8e..9d46be388e 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.c
@@ -1,70 +1,70 @@
-#include "sl_event_handler.h"
-
-#include "system_si91x.h"
-#include "rsi_nvic_priorities_config.h"
-#include "sli_siwx917_soc.h"
-#include "rsi_board.h"
-#include "rsi_debug.h"
-#if SL_ICD_ENABLED
-#include "sl_si91x_power_manager.h"
-#include "rsi_wisemcu_hardware_setup.h"
-#include "sl_si91x_power_manager_init.h"
-#endif // SL_ICD_ENABLED
-#include "SEGGER_RTT.h"
-#include "sl_sleeptimer.h"
-#include "sl_si91x_button_instances.h"
-#include "sl_si91x_led_instances.h"
-#include "sl_ulp_timer_instances.h"
-#include "sl_iostream_rtt.h"
-#include "cmsis_os2.h"
-#include "sl_iostream_init_instances.h"
-
-void sl_platform_init(void) 
-{
-  SystemCoreClockUpdate();
-  sl_si91x_device_init_nvic();
-  sli_si91x_platform_init();
-  RSI_Board_Init();
-  DEBUGINIT();
-#if SL_ICD_ENABLED
-  sl_si91x_hardware_setup();
-#endif // SL_ICD_ENABLED
-  osKernelInitialize();
-}
-
-void sl_kernel_start(void)
-{
-  osKernelStart();
-}
-
-void sl_driver_init(void)
-{
-  button_init_instances();
-  led_init_instances();
-}
-
-void sl_service_init(void) 
-{
-#if SL_ICD_ENABLED
-  sl_si91x_power_manager_init();
-  sli_si91x_power_manager_configure_ram_and_peripheral();
-#endif // SL_ICD_ENABLED
-#if defined(DISPLAY_ENABLED) || defined(SL_ICD_ENABLED)
-  sl_sleeptimer_init();
-#endif // DISPLAY_ENABLED || SL_ICD_ENABLED
-  sl_iostream_init_instances();
-}
-
-void sl_stack_init(void)
-{
-}
-
-void sl_internal_app_init(void)
-{
-}
-
-void sl_iostream_init_instances(void)
-{
-  sl_iostream_rtt_init();
-}
-
+#include "sl_event_handler.h"
+
+#include "system_si91x.h"
+#include "rsi_nvic_priorities_config.h"
+#include "sli_siwx917_soc.h"
+#include "rsi_board.h"
+#include "rsi_debug.h"
+#if SL_ICD_ENABLED
+#include "sl_si91x_power_manager.h"
+#include "rsi_wisemcu_hardware_setup.h"
+#include "sl_si91x_power_manager_init.h"
+#endif // SL_ICD_ENABLED
+#include "SEGGER_RTT.h"
+#include "sl_sleeptimer.h"
+#include "sl_si91x_button_instances.h"
+#include "sl_si91x_led_instances.h"
+#include "sl_ulp_timer_instances.h"
+#include "sl_iostream_rtt.h"
+#include "cmsis_os2.h"
+#include "sl_iostream_init_instances.h"
+
+void sl_platform_init(void)
+{
+  SystemCoreClockUpdate();
+  sl_si91x_device_init_nvic();
+  sli_si91x_platform_init();
+  RSI_Board_Init();
+  DEBUGINIT();
+#if SL_ICD_ENABLED
+  sl_si91x_hardware_setup();
+#endif // SL_ICD_ENABLED
+  osKernelInitialize();
+}
+
+void sl_kernel_start(void)
+{
+  osKernelStart();
+}
+
+void sl_driver_init(void)
+{
+  button_init_instances();
+  led_init_instances();
+}
+
+void sl_service_init(void)
+{
+#if SL_ICD_ENABLED
+  sl_si91x_power_manager_init();
+  sli_si91x_power_manager_configure_ram_and_peripheral();
+#endif // SL_ICD_ENABLED
+#if defined(DISPLAY_ENABLED) || defined(SL_ICD_ENABLED)
+  sl_sleeptimer_init();
+#endif // DISPLAY_ENABLED || SL_ICD_ENABLED
+  sl_iostream_init_instances();
+}
+
+void sl_stack_init(void)
+{
+}
+
+void sl_internal_app_init(void)
+{
+}
+
+void sl_iostream_init_instances(void)
+{
+  sl_iostream_rtt_init();
+}
+
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h b/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h
index 589cd59be2..ef8751b80f 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_event_handler.h
@@ -1,12 +1,12 @@
-#ifndef SL_EVENT_HANDLER_H
-#define SL_EVENT_HANDLER_H
-
-void sl_platform_init(void);
-void sl_kernel_start(void);
-void sl_driver_init(void);
-void sl_service_init(void);
-void sl_stack_init(void);
-void sl_internal_app_init(void);
-void sl_iostream_init_instances(void);
-
-#endif // SL_EVENT_HANDLER_H
+#ifndef SL_EVENT_HANDLER_H
+#define SL_EVENT_HANDLER_H
+
+void sl_platform_init(void);
+void sl_kernel_start(void);
+void sl_driver_init(void);
+void sl_service_init(void);
+void sl_stack_init(void);
+void sl_internal_app_init(void);
+void sl_iostream_init_instances(void);
+
+#endif // SL_EVENT_HANDLER_H
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.c b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.c
index fe071eee61..064e882d0e 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.c
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.c
@@ -1,27 +1,27 @@
-#include "sl_iostream.h"
-#include "sl_iostream_handles.h"
-#include "string.h"
-
-const sl_iostream_instance_info_t *sl_iostream_instances_info[] = {
-
-    &sl_iostream_instance_rtt_info,
-  
-};
-
-const uint32_t sl_iostream_instances_count = sizeof(sl_iostream_instances_info) / sizeof(sl_iostream_instances_info[0]);
-
-/***************************************************************************//**
- * Get iostream instance handle for a given name
- *
- * @return  Instance handle if it exist, NULL otherwise.
- ******************************************************************************/
-sl_iostream_t *sl_iostream_get_handle(char *name)
-{
-  for (uint32_t i = 0; i < sl_iostream_instances_count; i++) {
-    if (strcmp(sl_iostream_instances_info[i]->name, name) == 0) {
-      return sl_iostream_instances_info[i]->handle;
-    }
-  }
-
-  return NULL;
+#include "sl_iostream.h"
+#include "sl_iostream_handles.h"
+#include "string.h"
+
+const sl_iostream_instance_info_t *sl_iostream_instances_info[] = {
+
+    &sl_iostream_instance_rtt_info,
+  
+};
+
+const uint32_t sl_iostream_instances_count = sizeof(sl_iostream_instances_info) / sizeof(sl_iostream_instances_info[0]);
+
+/***************************************************************************//**
+ * Get iostream instance handle for a given name
+ *
+ * @return  Instance handle if it exist, NULL otherwise.
+ ******************************************************************************/
+sl_iostream_t *sl_iostream_get_handle(char *name)
+{
+  for (uint32_t i = 0; i < sl_iostream_instances_count; i++) {
+    if (strcmp(sl_iostream_instances_info[i]->name, name) == 0) {
+      return sl_iostream_instances_info[i]->handle;
+    }
+  }
+
+  return NULL;
 }
\ No newline at end of file
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.h b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.h
index 770dc48896..e7aab8e58b 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.h
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_handles.h
@@ -1,20 +1,20 @@
-#ifndef SL_IOSTREAM_HANDLES_H
-#define SL_IOSTREAM_HANDLES_H
-#include "sl_iostream.h"
-#include "sl_iostream_rtt.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const sl_iostream_instance_info_t *sl_iostream_instances_info[];
-extern const uint32_t sl_iostream_instances_count;
-
-sl_iostream_t *sl_iostream_get_handle(char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // SL_IOSTREAM_HANDLES_H
+#ifndef SL_IOSTREAM_HANDLES_H
+#define SL_IOSTREAM_HANDLES_H
+#include "sl_iostream.h"
+#include "sl_iostream_rtt.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const sl_iostream_instance_info_t *sl_iostream_instances_info[];
+extern const uint32_t sl_iostream_instances_count;
+
+sl_iostream_t *sl_iostream_get_handle(char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // SL_IOSTREAM_HANDLES_H
diff --git a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_init_instances.h b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_init_instances.h
index 0dc7af5f58..c092c37eec 100644
--- a/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_init_instances.h
+++ b/matter/si91x/siwx917/BRD4338A/autogen/sl_iostream_init_instances.h
@@ -1,16 +1,16 @@
-#ifndef SL_IOSTREAM_INIT_INSTANCES_H
-#define SL_IOSTREAM_INIT_INSTANCES_H
-
-#include "sl_iostream.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Initialize iostream component(s) / instance(s)
-void sl_iostream_init_instances(void);
-
-#ifdef __cplusplus
-}
-#endif
-
+#ifndef SL_IOSTREAM_INIT_INSTANCES_H
+#define SL_IOSTREAM_INIT_INSTANCES_H
+
+#include "sl_iostream.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Initialize iostream component(s) / instance(s)
+void sl_iostream_init_instances(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SL_IOSTREAM_INIT_INSTANCES_H
\ No newline at end of file
diff --git a/matter/si91x/siwx917/BRD4338A/config/RTE_Device_917.h b/matter/si91x/siwx917/BRD4338A/config/RTE_Device_917.h
index add7bf77a8..64cb5a5637 100644
--- a/matter/si91x/siwx917/BRD4338A/config/RTE_Device_917.h
+++ b/matter/si91x/siwx917/BRD4338A/config/RTE_Device_917.h
@@ -17,7 +17,7 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  *
- * $Date:        1. December 2016
+ * $Date:        1. June 2024
  * $Revision:    V2.4.4
  *
  * Project:      RTE Device Configuration for Si91x 2.0 B0 BRD4338A
@@ -47,7 +47,7 @@
 #define RTE_BUTTON1_PIN    (11U)
 #define RTE_BUTTON1_PAD    6
 
-#define RTE_LED0_PORT   0
+#define RTE_LED0_PORT   4
 #define RTE_LED0_NUMBER 0
 #define RTE_LED0_PIN    (2U)
 
@@ -63,7 +63,7 @@
 
 #define RTE_USART0 1
 
-#define RTE_USART0_CLK_SRC      USART_INTFPLLCLK
+#define RTE_USART0_CLK_SRC      USART_ULPREFCLK
 #define RTE_USART0_CLK_DIV_FACT 1
 #define RTE_USART0_FRAC_DIV_SEL USART_FRACTIONAL_DIVIDER
 
@@ -225,7 +225,7 @@
 #define RTE_USART0_RX_PORT 0
 #define RTE_USART0_RX_PIN  65
 #define RTE_USART0_RX_MUX  2
-#define RTE_USART0_RX_PAD  24
+#define RTE_USART0_RX_PAD  23
 #elif (RTE_USART0_RX_PORT_ID == 4)
 #define RTE_USART0_RX_PORT 0
 #define RTE_USART0_RX_PIN  70
@@ -255,7 +255,7 @@
 #if (USART0_RX_LOC == 12)
 #define RTE_USART0_RX_PIN (USART0_RX_PIN + GPIO_MAX_PIN)
 #define RTE_USART0_RX_MUX 2
-#define RTE_USART0_RX_PAD 24
+#define RTE_USART0_RX_PAD 23
 #endif
 #if (USART0_RX_LOC == 13)
 #define RTE_USART0_RX_PIN (USART0_RX_PIN + GPIO_MAX_PIN)
@@ -578,7 +578,7 @@
 // <i> Configuration settings for Driver_UART1 in component ::CMSIS Driver:USART
 #define RTE_UART1 1
 
-#define RTE_UART1_CLK_SRC      USART_INTFPLLCLK
+#define RTE_UART1_CLK_SRC      USART_ULPREFCLK
 #define RTE_UART1_CLK_DIV_FACT 1
 #define RTE_UART1_FRAC_DIV_SEL USART_FRACTIONAL_DIVIDER
 
@@ -4887,3 +4887,13 @@
 // UULP GPIO as enable pin for sensors
 #define SENSOR_ENABLE_GPIO_MAPPED_TO_UULP
 #define SENSOR_ENABLE_GPIO_PIN RTE_UULP_GPIO_1_PIN
+
+// Memlcd GPIOs
+#define RTE_MEMLCD_CS_PIN  10 // Memlcd SPI CS pin
+#define RTE_MEMLCD_CS_PORT 0  // Memlcd SPI CS port
+
+#define RTE_MEMLCD_EXTCOMIN_PIN  3 // Memlcd external communication pin
+#define RTE_MEMLCD_EXTCOMIN_PORT 0 // Memlcd external communication port
+
+#define RTE_MEMLCD_ENABLE_DISPLAY_PIN  0 // Memlcd display enable pin
+#define RTE_MEMLCD_ENABLE_DISPLAY_PORT 0 // Memlcd display enable port
diff --git a/matter/si91x/siwx917/BRD4338A/config/emlib_core_debug_config.h b/matter/si91x/siwx917/BRD4338A/config/emlib_core_debug_config.h
index 13e4b919ea..07ee9b9efb 100644
--- a/matter/si91x/siwx917/BRD4338A/config/emlib_core_debug_config.h
+++ b/matter/si91x/siwx917/BRD4338A/config/emlib_core_debug_config.h
@@ -1,45 +1,45 @@
-/***************************************************************************//**
- * @file
- * @brief emlib_core Configuration
- *******************************************************************************
- * # License
- * <b>Copyright 2019 Silicon Laboratories Inc. www.silabs.com</b>
- *******************************************************************************
- *
- * SPDX-License-Identifier: Zlib
- *
- * The licensor of this software is Silicon Laboratories Inc.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- *
- ******************************************************************************/
-
-#ifndef EM_CORE_DEBUG_CONFIG_H
-#define EM_CORE_DEBUG_CONFIG_H
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <h> Core Configuration
-
-// <q SL_EMLIB_CORE_ENABLE_INTERRUPT_DISABLED_TIMING> Enables measuring of interrupt disable time for debugging purposes.
-// <i> Default: 0
-#define SL_EMLIB_CORE_ENABLE_INTERRUPT_DISABLED_TIMING    0
-
-// </h>
-
-// <<< end of configuration section >>>
-#endif // EM_CORE_CONFIG_H
+/***************************************************************************//**
+ * @file
+ * @brief emlib_core Configuration
+ *******************************************************************************
+ * # License
+ * <b>Copyright 2019 Silicon Laboratories Inc. www.silabs.com</b>
+ *******************************************************************************
+ *
+ * SPDX-License-Identifier: Zlib
+ *
+ * The licensor of this software is Silicon Laboratories Inc.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ ******************************************************************************/
+
+#ifndef EM_CORE_DEBUG_CONFIG_H
+#define EM_CORE_DEBUG_CONFIG_H
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <h> Core Configuration
+
+// <q SL_EMLIB_CORE_ENABLE_INTERRUPT_DISABLED_TIMING> Enables measuring of interrupt disable time for debugging purposes.
+// <i> Default: 0
+#define SL_EMLIB_CORE_ENABLE_INTERRUPT_DISABLED_TIMING    0
+
+// </h>
+
+// <<< end of configuration section >>>
+#endif // EM_CORE_CONFIG_H
diff --git a/matter/si91x/siwx917/BRD4338A/config/pin_config.h b/matter/si91x/siwx917/BRD4338A/config/pin_config.h
index ab6a567430..2bbc8c59c3 100644
--- a/matter/si91x/siwx917/BRD4338A/config/pin_config.h
+++ b/matter/si91x/siwx917/BRD4338A/config/pin_config.h
@@ -46,8 +46,74 @@
 // $[PWM]
 // [PWM]$
 
-// $[ADC]
-// [ADC]$
+// $[PWM_CH0]
+// [PWM_CH0]$
+
+// $[PWM_CH1]
+// [PWM_CH1]$
+
+// $[PWM_CH2]
+// [PWM_CH2]$
+
+// $[PWM_CH3]
+// [PWM_CH3]$
+
+// $[ADC_CH1]
+// [ADC_CH1]$
+
+// $[ADC_CH2]
+// [ADC_CH2]$
+
+// $[ADC_CH3]
+// [ADC_CH3]$
+
+// $[ADC_CH4]
+// [ADC_CH4]$
+
+// $[ADC_CH5]
+// [ADC_CH5]$
+
+// $[ADC_CH6]
+// [ADC_CH6]$
+
+// $[ADC_CH7]
+// [ADC_CH7]$
+
+// $[ADC_CH8]
+// [ADC_CH8]$
+
+// $[ADC_CH9]
+// [ADC_CH9]$
+
+// $[ADC_CH10]
+// [ADC_CH10]$
+
+// $[ADC_CH11]
+// [ADC_CH11]$
+
+// $[ADC_CH12]
+// [ADC_CH12]$
+
+// $[ADC_CH13]
+// [ADC_CH13]$
+
+// $[ADC_CH14]
+// [ADC_CH14]$
+
+// $[ADC_CH15]
+// [ADC_CH15]$
+
+// $[ADC_CH16]
+// [ADC_CH16]$
+
+// $[ADC_CH17]
+// [ADC_CH17]$
+
+// $[ADC_CH18]
+// [ADC_CH18]$
+
+// $[ADC_CH19]
+// [ADC_CH19]$
 
 // $[COMP1]
 // [COMP1]$
diff --git a/matter/si91x/siwx917/BRD4338A/config/sl_net_default_values.h b/matter/si91x/siwx917/BRD4338A/config/sl_net_default_values.h
index d1b7ad08f6..ffe3767f49 100644
--- a/matter/si91x/siwx917/BRD4338A/config/sl_net_default_values.h
+++ b/matter/si91x/siwx917/BRD4338A/config/sl_net_default_values.h
@@ -82,6 +82,7 @@
         .channel.channel = SL_WIFI_AUTO_CHANNEL, \
         .channel.band = SL_WIFI_AUTO_BAND, \
         .channel.bandwidth = SL_WIFI_AUTO_BANDWIDTH, \
+        .channel_bitmap.channel_bitmap_2_4 = SL_WIFI_DEFAULT_CHANNEL_BITMAP, \
         .bssid = {{0}}, \
         .bss_type = SL_WIFI_BSS_TYPE_INFRASTRUCTURE, \
         .security = DEFAULT_WIFI_CLIENT_SECURITY_TYPE, \
@@ -118,7 +119,7 @@
         .maximum_clients = 3, \
         .beacon_stop = 0, \
         .tdi_flags =SL_WIFI_TDI_NONE, \
-        .is_11n_enabled = 0, \
+        .is_11n_enabled = 1, \
     }, \
     .ip = { \
       .mode      = SL_IP_MANAGEMENT_STATIC_IP, \
diff --git a/matter/si91x/siwx917/BRD4338A/config/sl_si91x_led_config.h b/matter/si91x/siwx917/BRD4338A/config/sl_si91x_led_config.h
index e7eaab11a7..3e553cbd07 100644
--- a/matter/si91x/siwx917/BRD4338A/config/sl_si91x_led_config.h
+++ b/matter/si91x/siwx917/BRD4338A/config/sl_si91x_led_config.h
@@ -13,6 +13,8 @@
 
 #define SL_SI91x_LED_COUNT 2
 
+#ifndef SI917_DEVKIT
+
 #define SL_LED_LED0_PIN    RTE_LED0_PIN
 #define SL_LED_LED0_PORT   RTE_LED0_PORT
 #define SL_LED_LED0_NUMBER RTE_LED0_NUMBER
@@ -22,4 +24,13 @@
 #define SL_LED_LED1_NUMBER RTE_LED1_NUMBER
 #define SL_LED_LED1_PAD    RTE_LED1_PAD
 
+#else
+
+#define SL_LED_LEDB_PIN    RTE_LEDB_PIN
+#define SL_LED_LEDB_PORT   RTE_LEDB_PORT
+#define SL_LED_LEDB_NUMBER RTE_LEDB_NUMBER
+#define SL_LED_LEDB_PAD    RTE_LEDB_PAD
+
+#endif
+
 #endif // SL_SI91X_LED_CONFIG_H
diff --git a/matter/si91x/siwx917/BRD4338A/config/sl_si91x_ulp_uart_config.h b/matter/si91x/siwx917/BRD4338A/config/sl_si91x_ulp_uart_config.h
index 63ef4c9150..8bd20f97e9 100644
--- a/matter/si91x/siwx917/BRD4338A/config/sl_si91x_ulp_uart_config.h
+++ b/matter/si91x/siwx917/BRD4338A/config/sl_si91x_ulp_uart_config.h
@@ -74,15 +74,11 @@ extern "C" {
 // <SL_USART_DATA_BITS_6=> 6
 // <SL_USART_DATA_BITS_7=> 7
 // <SL_USART_DATA_BITS_8=> 8
-// <SL_USART_DATA_BITS_9=> 9
 // <i> Default: USART_DATA_BITS_8
 #define SL_ULP_UART_DATA_BITS SL_USART_DATA_BITS_8
 
 // <o SL_ULP_UART_FLOW_CONTROL_TYPE> Flow control
 // <SL_USART_FLOW_CONTROL_NONE=> None
-// <SL_USART_FLOW_CONTROL_CTS=> CTS
-// <SL_USART_FLOW_CONTROL_RTS=> RTS
-// <SL_USART_FLOW_CONTROL_RTS_CTS=> CTS/RTS
 // <i> Default: USART_FLOW_CONTROL_NONE
 #define SL_ULP_UART_FLOW_CONTROL_TYPE SL_USART_FLOW_CONTROL_NONE
 #endif