diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt
index 462683cdd18..0c2b74fb59b 100644
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -1347,6 +1347,9 @@ if(CONFIG_BT_AUDIO)
     if(CONFIG_IDF_TARGET_ESP32H4)
         add_prebuilt_library(ble_audio "esp_ble_audio/lib/lib/esp32h4/libble_audio.a")
         target_link_libraries(${COMPONENT_LIB} PRIVATE ble_audio)
+    elseif(CONFIG_IDF_TARGET_ESP32S31)
+        add_prebuilt_library(ble_audio "esp_ble_audio/lib/lib/esp32s31/libble_audio.a")
+        target_link_libraries(${COMPONENT_LIB} PRIVATE ble_audio)
     endif()
 endif()
 
diff --git a/components/bt/esp_ble_audio/Kconfig.in b/components/bt/esp_ble_audio/Kconfig.in
index 7e97dc28cf9..8b576a15901 100644
--- a/components/bt/esp_ble_audio/Kconfig.in
+++ b/components/bt/esp_ble_audio/Kconfig.in
@@ -39,6 +39,10 @@ menu "CAP Options"
     rsource "Kconfig/Kconfig.cap.in"
 endmenu
 
+menu "TBS Options"
+    rsource "Kconfig/Kconfig.tbs.in"
+endmenu
+
 menu "CCP Options"
     rsource "Kconfig/Kconfig.ccp.in"
 endmenu
@@ -71,18 +75,14 @@ menu "PACS Options"
     rsource "Kconfig/Kconfig.pacs.in"
 endmenu
 
-menu "TBS Options"
-    rsource "Kconfig/Kconfig.tbs.in"
+menu "VOCS Options"
+    rsource "Kconfig/Kconfig.vocs.in"
 endmenu
 
 menu "VCP Options"
     rsource "Kconfig/Kconfig.vcp.in"
 endmenu
 
-menu "VOCS Options"
-    rsource "Kconfig/Kconfig.vocs.in"
-endmenu
-
 menu "TMAP Options"
     rsource "Kconfig/Kconfig.tmap.in"
 endmenu
diff --git a/components/bt/esp_ble_audio/include/zephyr/bluetooth/conn.h b/components/bt/esp_ble_audio/include/zephyr/bluetooth/conn.h
index 61d441168aa..b1415e90296 100644
--- a/components/bt/esp_ble_audio/include/zephyr/bluetooth/conn.h
+++ b/components/bt/esp_ble_audio/include/zephyr/bluetooth/conn.h
@@ -422,7 +422,7 @@ int bt_conn_cb_unregister(struct bt_conn_cb *cb);
  *  @param _name Name of callback structure.
  */
 #define BT_CONN_CB_DEFINE(_name)                    \
-    static const STRUCT_SECTION_ITERABLE(bt_conn_cb,        \
+    static STRUCT_SECTION_ITERABLE(bt_conn_cb,        \
                         _CONCAT(bt_conn_cb_,    \
                             _name))
 
diff --git a/components/bt/esp_ble_audio/lib/lib b/components/bt/esp_ble_audio/lib/lib
index 8e7fe18acf4..4d80f4ef905 160000
--- a/components/bt/esp_ble_audio/lib/lib
+++ b/components/bt/esp_ble_audio/lib/lib
@@ -1 +1 @@
-Subproject commit 8e7fe18acf4c3b7d4a74d6a1c6abc6b40941c20e
+Subproject commit 4d80f4ef905e451af52d7d6401edc7f311a4c85b
diff --git a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
index 00d406c8703..05ef9ee1b60 100644
--- a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
@@ -1175,6 +1175,14 @@ config SOC_BLE_SUPPORTED
     bool
     default y
 
+config SOC_BLE_ISO_SUPPORTED
+    bool
+    default y
+
+config SOC_BLE_AUDIO_SUPPORTED
+    bool
+    default y
+
 config SOC_ESP_NIMBLE_CONTROLLER
     bool
     default y
diff --git a/components/soc/esp32s31/include/soc/soc_caps.h b/components/soc/esp32s31/include/soc/soc_caps.h
index 0cd971d7313..91740954610 100644
--- a/components/soc/esp32s31/include/soc/soc_caps.h
+++ b/components/soc/esp32s31/include/soc/soc_caps.h
@@ -492,6 +492,8 @@
 #define SOC_BT_CLASSIC_SUPPORTED                    (1)     /*!< Support Bluetooth Classic hardware */
 #define SOC_BLE_SUPPORTED                           (1)     /*!< Support Bluetooth Low Energy hardware */
 // #define SOC_BLE_MESH_SUPPORTED                      (1)     /*!< Support BLE MESH */
+#define SOC_BLE_ISO_SUPPORTED                       (1)     /*!< Support BLE ISO */
+#define SOC_BLE_AUDIO_SUPPORTED                     (1)     /*!< Support BLE Audio */
 #define SOC_ESP_NIMBLE_CONTROLLER                   (1)     /*!< Support BLE EMBEDDED controller V1 */
 #define SOC_BLE_50_SUPPORTED                        (1)     /*!< Support Bluetooth 5.0 */
 #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED            (1)     /*!< Support BLE device privacy mode */
@@ -502,7 +504,6 @@
 #define SOC_BLE_CTE_SUPPORTED                       (1)     /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
 #define SOC_BLE_SUBRATE_SUPPORTED                   (1)     /*!< Support Bluetooth LE Connection Subrating */
 #define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE          (1)     /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */
-// #define SOC_BLE_ISO_SUPPORTED                       (1)     /*!< Support Bluetooth ISO */
 
 /*-------------------------- I2S CAPS ----------------------------------------*/
 #define SOC_I2S_NUM                          (2U)
diff --git a/examples/bluetooth/.build-test-rules.yml b/examples/bluetooth/.build-test-rules.yml
index ec503734214..a5eeb59bdf5 100644
--- a/examples/bluetooth/.build-test-rules.yml
+++ b/examples/bluetooth/.build-test-rules.yml
@@ -180,19 +180,15 @@ examples/bluetooth/blufi:
 
 examples/bluetooth/esp_ble_audio:
   <<: *bt_default_depends
-  enable:
-    - if: SOC_BLE_AUDIO_SUPPORTED == 1 and IDF_TARGET == "esp32H4"
-      temporary: true
-      reason: BLE Audio examples only supported on ESP32-H4
+  disable:
+    - if: SOC_BLE_AUDIO_SUPPORTED != 1
   depends_filepatterns:
     - examples/bluetooth/esp_ble_audio/common_components/**/*
 
 examples/bluetooth/esp_ble_iso:
   <<: *bt_default_depends
-  enable:
-    - if: SOC_BLE_ISO_SUPPORTED == 1 and IDF_TARGET == "esp32H4"
-      temporary: true
-      reason: BLE ISO examples only supported on ESP32-H4
+  disable:
+    - if: SOC_BLE_ISO_SUPPORTED != 1
   depends_filepatterns:
     - examples/bluetooth/esp_ble_iso/common_components/**/*
 
diff --git a/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/README.md b/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/README.md
index 22156e7fac0..98ba194367e 100644
--- a/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/README.md
+++ b/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BAP Broadcast Sink Example
 
diff --git a/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/bap/broadcast_sink/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/bap/broadcast_source/README.md b/examples/bluetooth/esp_ble_audio/bap/broadcast_source/README.md
index 3d5e55cf316..f20a746c808 100644
--- a/examples/bluetooth/esp_ble_audio/bap/broadcast_source/README.md
+++ b/examples/bluetooth/esp_ble_audio/bap/broadcast_source/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BAP Broadcast Source Example
 
diff --git a/examples/bluetooth/esp_ble_audio/bap/broadcast_source/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/bap/broadcast_source/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/bap/broadcast_source/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/bap/unicast_client/README.md b/examples/bluetooth/esp_ble_audio/bap/unicast_client/README.md
index 4ed16316a87..74bfa915a2c 100644
--- a/examples/bluetooth/esp_ble_audio/bap/unicast_client/README.md
+++ b/examples/bluetooth/esp_ble_audio/bap/unicast_client/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BAP Unicast Client Example
 
diff --git a/examples/bluetooth/esp_ble_audio/bap/unicast_client/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/bap/unicast_client/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/bap/unicast_client/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/bap/unicast_server/README.md b/examples/bluetooth/esp_ble_audio/bap/unicast_server/README.md
index d70c3d5a541..b3c8abf7a36 100644
--- a/examples/bluetooth/esp_ble_audio/bap/unicast_server/README.md
+++ b/examples/bluetooth/esp_ble_audio/bap/unicast_server/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BAP Unicast Server Example
 
diff --git a/examples/bluetooth/esp_ble_audio/bap/unicast_server/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/bap/unicast_server/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/bap/unicast_server/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/cap/acceptor/README.md b/examples/bluetooth/esp_ble_audio/cap/acceptor/README.md
index f6fa9c8d5a0..b5f765735b0 100644
--- a/examples/bluetooth/esp_ble_audio/cap/acceptor/README.md
+++ b/examples/bluetooth/esp_ble_audio/cap/acceptor/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # CAP Acceptor Example
 
diff --git a/examples/bluetooth/esp_ble_audio/cap/acceptor/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/cap/acceptor/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/cap/acceptor/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/cap/initiator/README.md b/examples/bluetooth/esp_ble_audio/cap/initiator/README.md
index 229095e2661..6f3708d19e1 100644
--- a/examples/bluetooth/esp_ble_audio/cap/initiator/README.md
+++ b/examples/bluetooth/esp_ble_audio/cap/initiator/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # CAP Initiator Example
 
diff --git a/examples/bluetooth/esp_ble_audio/cap/initiator/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/cap/initiator/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/cap/initiator/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/bmr/README.md b/examples/bluetooth/esp_ble_audio/tmap/bmr/README.md
index 9e9bfc49905..dd5c3eef9d0 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/bmr/README.md
+++ b/examples/bluetooth/esp_ble_audio/tmap/bmr/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # TMAP Broadcast Media Receiver (BMR) Example
 
diff --git a/examples/bluetooth/esp_ble_audio/tmap/bmr/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/tmap/bmr/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/bmr/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/bms/README.md b/examples/bluetooth/esp_ble_audio/tmap/bms/README.md
index 89ae2235098..5645de0935f 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/bms/README.md
+++ b/examples/bluetooth/esp_ble_audio/tmap/bms/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # TMAP Broadcast Media Sender (BMS) Example
 
diff --git a/examples/bluetooth/esp_ble_audio/tmap/bms/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/tmap/bms/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/bms/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/central/README.md b/examples/bluetooth/esp_ble_audio/tmap/central/README.md
index 6c845bcd299..7ea9b314a73 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/central/README.md
+++ b/examples/bluetooth/esp_ble_audio/tmap/central/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # TMAP Central Example
 
diff --git a/examples/bluetooth/esp_ble_audio/tmap/central/partitions.csv b/examples/bluetooth/esp_ble_audio/tmap/central/partitions.csv
new file mode 100644
index 00000000000..5fc9dd41f8c
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/central/partitions.csv
@@ -0,0 +1,5 @@
+# Name,         Type,   SubType,    Offset,     Size,   Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+nvs,            data,   nvs,        0x9000,     16k
+phy_init,       data,   phy,        0xf000,     4k
+factory,        app,    factory,    0x10000,    1600k
diff --git a/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults b/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults
index 1d7ff95251e..339e7447f3a 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults
+++ b/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults
@@ -2,6 +2,9 @@
 # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
 
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
 CONFIG_BT_ENABLED=y
 CONFIG_BT_BLUEDROID_ENABLED=n
 CONFIG_BT_NIMBLE_ENABLED=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/central/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/peripheral/README.md b/examples/bluetooth/esp_ble_audio/tmap/peripheral/README.md
index 5f8704bc78a..eb226d30fc2 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/peripheral/README.md
+++ b/examples/bluetooth/esp_ble_audio/tmap/peripheral/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # TMAP Peripheral Example
 
diff --git a/examples/bluetooth/esp_ble_audio/tmap/peripheral/partitions.csv b/examples/bluetooth/esp_ble_audio/tmap/peripheral/partitions.csv
new file mode 100644
index 00000000000..5fc9dd41f8c
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/peripheral/partitions.csv
@@ -0,0 +1,5 @@
+# Name,         Type,   SubType,    Offset,     Size,   Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+nvs,            data,   nvs,        0x9000,     16k
+phy_init,       data,   phy,        0xf000,     4k
+factory,        app,    factory,    0x10000,    1600k
diff --git a/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults b/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults
index ae13965b054..f6346788a9c 100644
--- a/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults
+++ b/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults
@@ -2,6 +2,9 @@
 # Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
 #
 
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
 CONFIG_BT_ENABLED=y
 CONFIG_BT_BLUEDROID_ENABLED=n
 CONFIG_BT_NIMBLE_ENABLED=y
diff --git a/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_audio/tmap/peripheral/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_iso/big_broadcaster/README.md b/examples/bluetooth/esp_ble_iso/big_broadcaster/README.md
index 179000fb045..81b548d5d19 100644
--- a/examples/bluetooth/esp_ble_iso/big_broadcaster/README.md
+++ b/examples/bluetooth/esp_ble_iso/big_broadcaster/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BLE BIG Broadcaster Example
 
diff --git a/examples/bluetooth/esp_ble_iso/big_broadcaster/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_iso/big_broadcaster/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_iso/big_broadcaster/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_iso/big_receiver/README.md b/examples/bluetooth/esp_ble_iso/big_receiver/README.md
index 31872282a2a..013f332d821 100644
--- a/examples/bluetooth/esp_ble_iso/big_receiver/README.md
+++ b/examples/bluetooth/esp_ble_iso/big_receiver/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BLE BIG Receiver Example
 
diff --git a/examples/bluetooth/esp_ble_iso/big_receiver/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_iso/big_receiver/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_iso/big_receiver/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_iso/cis_central/README.md b/examples/bluetooth/esp_ble_iso/cis_central/README.md
index b8a38b48a3e..85ebcda9416 100644
--- a/examples/bluetooth/esp_ble_iso/cis_central/README.md
+++ b/examples/bluetooth/esp_ble_iso/cis_central/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BLE CIS Central Example
 
diff --git a/examples/bluetooth/esp_ble_iso/cis_central/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_iso/cis_central/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_iso/cis_central/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y
diff --git a/examples/bluetooth/esp_ble_iso/cis_peripheral/README.md b/examples/bluetooth/esp_ble_iso/cis_peripheral/README.md
index 880ef4c663a..0d9fde3e536 100644
--- a/examples/bluetooth/esp_ble_iso/cis_peripheral/README.md
+++ b/examples/bluetooth/esp_ble_iso/cis_peripheral/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-H4 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-H4 | ESP32-S31 |
+| ----------------- | -------- | --------- |
 
 # BLE CIS Peripheral Example
 
diff --git a/examples/bluetooth/esp_ble_iso/cis_peripheral/sdkconfig.defaults.esp32s31 b/examples/bluetooth/esp_ble_iso/cis_peripheral/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..1f18ae5d6a9
--- /dev/null
+++ b/examples/bluetooth/esp_ble_iso/cis_peripheral/sdkconfig.defaults.esp32s31
@@ -0,0 +1,6 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_BT_LE_ISO_SUPPORT=y