diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2
index 11c0100a0..9cc76880e 100644
--- a/configs/defconfig.esp32c2
+++ b/configs/defconfig.esp32c2
@@ -1,7 +1,12 @@
 CONFIG_XTAL_FREQ_26=y
 CONFIG_XTAL_FREQ=26
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 1baf62540..804a908fd 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -2,6 +2,11 @@ CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_ESP_WIFI_11KV_SUPPORT=y
 CONFIG_ESP_WIFI_SCAN_CACHE=y
 CONFIG_ESP_WIFI_MBO_SUPPORT=y
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index 8a45b0eed..6b8e7808d 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -1,5 +1,10 @@
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
index 9bc304886..f5fa724a6 100644
--- a/configs/defconfig.esp32h2
+++ b/configs/defconfig.esp32h2
@@ -1,5 +1,10 @@
 CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
 CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/configs/defconfig.esp32p4 b/configs/defconfig.esp32p4
index 8b04e8469..eaa692910 100644
--- a/configs/defconfig.esp32p4
+++ b/configs/defconfig.esp32p4
@@ -13,14 +13,3 @@ CONFIG_ESP_SDIO_PIN_D0=14
 CONFIG_ESP_SDIO_PIN_D1=15
 CONFIG_ESP_SDIO_PIN_D2=16
 CONFIG_ESP_SDIO_PIN_D3=17
-
-#
-# Chip revision
-#
-CONFIG_ESP32P4_REV_MIN_0=y
-# CONFIG_ESP32P4_REV_MIN_1 is not set
-CONFIG_ESP32P4_REV_MIN_FULL=0
-CONFIG_ESP_REV_MIN_FULL=0
-CONFIG_ESP32P4_REV_MAX_FULL=99
-CONFIG_ESP_REV_MAX_FULL=99
-# end of Chip revision
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 2c2cba3cd..26615d246 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -1,4 +1,9 @@
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
 CONFIG_SPIRAM=y
diff --git a/tools/config.sh b/tools/config.sh
index 89cd9856a..7088e8532 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -6,11 +6,11 @@ if [ -z $IDF_PATH ]; then
 fi
 
 if [ -z $IDF_BRANCH ]; then
-    IDF_BRANCH="release/v5.3"
+    IDF_BRANCH="release/v5.4"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-    AR_PR_TARGET_BRANCH="master"
+    AR_PR_TARGET_BRANCH="release/v3.2.x"
 fi
 
 if [ -z $IDF_TARGET ]; then
diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index 392eed508..f03b73d78 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -29,6 +29,8 @@ def replace_if_xz(system):
 
     new_url = system['url'].replace(".tar.xz", ".tar.gz")
     new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
+    new_signed_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
+    new_signed_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
     new_checksum = ""
     new_size = 0
 
@@ -76,6 +78,12 @@ def replace_if_xz(system):
         release_manifests.append(manifest)
 
     # find the new file in the list and get it's size and checksum
+    for file in release_manifests[manifest_index]['files']:
+        if file['name'] == new_signed_name:
+            print("Found a signed version of the file")
+            new_url = new_signed_url
+            new_name = new_signed_name
+            break
     for file in release_manifests[manifest_index]['files']:
         if file['name'] == new_name:
             system['url'] = new_url