diff --git a/.github/workflows/parallel_build.yaml b/.github/workflows/parallel_build.yaml
index b0f480646..7f7bb1eb5 100644
--- a/.github/workflows/parallel_build.yaml
+++ b/.github/workflows/parallel_build.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4, esp32p4_es]
+        target: [esp32, esp32u, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4, esp32p4_es]
       fail-fast: true
     steps:
     - uses: actions/checkout@v4
@@ -89,7 +89,7 @@ jobs:
           echo "Found firmware version: $FIRMWARE_VERSION"
           
           # Array of MCU targets that need sdkconfig updates
-          mcu_targets=("esp32" "esp32s2" "esp32s3" "esp32c2" "esp32c3" "esp32c6" "esp32h2" "esp32p4")
+          mcu_targets=("esp32" "esp32u" "esp32s2" "esp32s3" "esp32c2" "esp32c3" "esp32c6" "esp32h2" "esp32p4" "esp32p4_es")
           
           for mcu in "${mcu_targets[@]}"; do
             sdkconfig_path="framework-arduinoespressif32/tools/esp32-arduino-libs/$mcu/sdkconfig"
diff --git a/configs/builds.json b/configs/builds.json
index 6d1e28475..34a1e050b 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -143,6 +143,21 @@
 				["dio","80m"]
 			]
 		},
+		{
+			"chip_variant": "esp32u",
+			"target": "esp32",
+			"features":[],
+			"idf_libs":["dio","40m"],
+			"bootloaders":[
+				["qio","80m"],
+				["dio","80m"],
+				["qio","40m"],
+				["dio","40m"]
+			],
+			"mem_variants":[
+				["qio","80m"]
+			]
+		},
 		{
 			"target": "esp32s2",
 			"features":["qio_ram"],
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index ccd403ef6..e8aaea5ab 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -18,6 +18,7 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=2
 # CONFIG_BT_BTU_TASK_STACK_SIZE is not set
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
+CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=y
 
 # Enable ULP
 CONFIG_ULP_COPROC_ENABLED=y
diff --git a/configs/defconfig.esp32u b/configs/defconfig.esp32u
new file mode 100644
index 000000000..ec205d208
--- /dev/null
+++ b/configs/defconfig.esp32u
@@ -0,0 +1,50 @@
+CONFIG_FREERTOS_UNICORE=y
+# CONFIG_BOOTLOADER_SPI_CUSTOM_WP_PIN is not set
+CONFIG_BOOTLOADER_SPI_WP_PIN=7
+
+#
+# Bluetooth
+#
+CONFIG_BT_ENABLED=y
+CONFIG_BT_STACK_NO_LOG=y
+# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
+# CONFIG_BLE_MESH is not set
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=2
+# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
+# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
+# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
+# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
+# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
+# CONFIG_BTDM_CTRL_MODE_BTDM is not set
+# CONFIG_BT_BTC_TASK_STACK_SIZE is not set
+# CONFIG_BT_BTU_TASK_STACK_SIZE is not set
+CONFIG_BT_STACK_NO_LOG=y
+CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
+
+CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR=y
+
+CONFIG_ETH_ENABLED=y
+CONFIG_ETH_USE_ESP32_EMAC=y
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+CONFIG_ETH_USE_SPI_ETHERNET=y
+
+# CONFIG_SPIRAM is not set
+
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
+
+# CONFIG_UNITY_ENABLE_FLOAT is not set
+# CONFIG_UNITY_ENABLE_DOUBLE is not set
+# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
+# CONFIG_USE_WAKENET is not set
+# CONFIG_USE_MULTINET is not set
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
+# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
+# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
+# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y