diff --git a/configs/defconfig.esp32p4 b/configs/defconfig.esp32p4
index 850b5fd2..9cc5e839 100644
--- a/configs/defconfig.esp32p4
+++ b/configs/defconfig.esp32p4
@@ -14,17 +14,6 @@ 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
-
 # RGB Display Optimizations
 CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
 CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
diff --git a/tools/config.sh b/tools/config.sh
index 3349e455..1b2941e9 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/copy-libs.sh b/tools/copy-libs.sh
index 21efe1a7..53e41eee 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -90,12 +90,12 @@ fi
 # 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/"
-	EXCLUDE_LIBS+="esp_zb_api_ed;"
+	EXCLUDE_LIBS+="esp_zb_api.ed;"
 fi
 
 if [ -d "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.debug;"
+	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native;zboss_port.native.debug;"
 fi
 
 #collect includes, defines and c-flags
diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index 392eed50..f03b73d7 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