diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88cede199..1b0fca085 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,3 +33,8 @@ add_custom_command(
 	VERBATIM
 )
 add_custom_target(mem-variant DEPENDS "mem_variant")
+
+##################
+### ESP Matter ###
+##################
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
diff --git a/configs/defconfig.common b/configs/defconfig.common
index a6b42ed64..47310528c 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -75,8 +75,14 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
+CONFIG_LWIP_MULTICAST_PING=y
+CONFIG_LWIP_BROADCAST_PING=y
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
+CONFIG_MBEDTLS_HKDF_C=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
 CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
@@ -111,3 +117,13 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=1024
 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
+#
+# Matter Settings
+#
+# Disable Matter BLE
+CONFIG_ENABLE_CHIPOBLE=n
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+# ESP Insights
+CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
+# Use compact attribute storage mode
+CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index e2c9c33ea..7770504fc 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -8,23 +8,6 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 #CONFIG_ULP_COPROC_LP_CORE=y
 #CONFIG_ULP_COPROC_RESERVE_MEM=4096
 
-#
-# ESP32 Arduino OpenThread Configuration
-#
-# lwIP
-#
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
-CONFIG_LWIP_MULTICAST_PING=y
-CONFIG_LWIP_BROADCAST_PING=y
-# end of lwip
-
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-CONFIG_MBEDTLS_ECJPAKE_C=y
-# end of mbedTLS
-
 #
 # OpenThread
 #
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
index 79a13544d..dfd36395d 100644
--- a/configs/defconfig.esp32h2
+++ b/configs/defconfig.esp32h2
@@ -4,23 +4,6 @@ CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 
-#
-# ESP32 Arduino OpenThread Configuration
-#
-# lwIP
-#
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
-CONFIG_LWIP_MULTICAST_PING=y
-CONFIG_LWIP_BROADCAST_PING=y
-# end of lwip
-
-#
-# mbedTLS
-#
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
-CONFIG_MBEDTLS_ECJPAKE_C=y
-# end of mbedTLS
-
 #
 # OpenThread
 #
diff --git a/main/idf_component.yml b/main/idf_component.yml
index 011906d27..292709d64 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -22,6 +22,11 @@ dependencies:
     version: ">=1.4.2"
     rules:
       - if: "target in [esp32s3]"
+  espressif/esp_matter:
+    version: "^1.3.0"
+    require: public
+    rules:
+      - if: "target not in [esp32c2, esp32h2]"
 
   # esp-sr: "^1.3.1"
   # esp32-camera: "^2.0.4"
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 8ee2276dd..565eb4542 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -491,6 +491,17 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
 echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
 echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
 
+# Matter Library adjustments
+for flag_file in "c_flags" "cpp_flags" "S_flags"; do
+	echo "Fixing $FLAGS_DIR/$flag_file"
+ 	sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib\/address_resolve\/AddressResolve_DefaultImpl.h>\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/$flag_file > $FLAGS_DIR/$flag_file.temp
+	mv $FLAGS_DIR/$flag_file.temp $FLAGS_DIR/$flag_file
+done
+CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
+sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
+mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
+# End of Matter Library adjustments
+
 # copy zigbee + zboss lib
 if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
@@ -530,7 +541,7 @@ for item; do
 	done
 done
 
-for lib in "openthread" "espressif__esp-tflite-micro" "bt"; do
+for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_matter"; do
 	if [ -f "$AR_SDK/lib/lib$lib.a" ]; then
 		echo "Stripping $AR_SDK/lib/lib$lib.a"
 		"$TOOLCHAIN-strip" -g "$AR_SDK/lib/lib$lib.a"