diff --git a/.github/workflows/esp_dns__build.yml b/.github/workflows/esp_dns__build.yml
index 0baf8b833..ffea1b3f8 100644
--- a/.github/workflows/esp_dns__build.yml
+++ b/.github/workflows/esp_dns__build.yml
@@ -33,6 +33,9 @@ jobs:
         shell: bash
         working-directory: ${{matrix.test.path}}
         run: |
+          if [[ "${{ matrix.idf_ver }}" == "release-v5.3" || "${{ matrix.idf_ver }}" == "release-v5.4" ]]; then
+            export EXPECTED_WARNING="unknown kconfig symbol 'LWIP_USE_ESP_GETADDRINFO'"
+          fi
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
           python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/tls_cxx__build.yml b/.github/workflows/tls_cxx__build.yml
index 4733e0942..b9a8421eb 100644
--- a/.github/workflows/tls_cxx__build.yml
+++ b/.github/workflows/tls_cxx__build.yml
@@ -25,9 +25,6 @@ jobs:
       - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
         shell: bash
         run: |
-          if [[ "${{ matrix.idf_ver }}" != "latest" ]]; then
-            export EXPECTED_WARNING="unknown kconfig symbol 'MBEDTLS_SSL_COOKIE_C'"
-          fi
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
           python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.path }} -vv --preserve-all
diff --git a/components/mbedtls_cxx/examples/udp_mutual_auth/sdkconfig.defaults b/components/mbedtls_cxx/examples/udp_mutual_auth/sdkconfig.defaults
index 4449fccf3..f4780e839 100644
--- a/components/mbedtls_cxx/examples/udp_mutual_auth/sdkconfig.defaults
+++ b/components/mbedtls_cxx/examples/udp_mutual_auth/sdkconfig.defaults
@@ -1,3 +1,2 @@
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_SSL_COOKIE_C=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192
diff --git a/components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults b/components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults
index 2e7342d1e..76a202826 100644
--- a/components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults
+++ b/components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults
@@ -1,4 +1,3 @@
 CONFIG_IDF_TARGET="esp32"
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_SSL_COOKIE_C=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192
diff --git a/components/mdns/tests/test_afl_fuzz_host/Makefile b/components/mdns/tests/test_afl_fuzz_host/Makefile
index 6f45edb9d..0eac9ae83 100644
--- a/components/mdns/tests/test_afl_fuzz_host/Makefile
+++ b/components/mdns/tests/test_afl_fuzz_host/Makefile
@@ -34,6 +34,7 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi
                  -I$(COMPONENTS_DIR)/soc/src/esp32/include \
                  -I$(COMPONENTS_DIR)/xtensa/include \
                  -I$(COMPONENTS_DIR)/xtensa/esp32/include \
+                 -I$(COMPONENTS_DIR)/esp_hw_support/etm/include \
                  -I$(COMPILER_ICLUDE_DIR)/include
 
 
diff --git a/components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-API-for-get_stack_fr.patch b/components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-API-for-get_stack_fr.patch
index 227009444..441e9ad9a 100644
--- a/components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-API-for-get_stack_fr.patch
+++ b/components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-API-for-get_stack_fr.patch
@@ -16,7 +16,7 @@ index d248d59..1117926 100644
      TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
      vTaskGetSnapshot(cur_task, &snap_shot);
 -    snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);;
-+#if (ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 5, 0))
++#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0))
 +    snap_shot.pxTopOfStack = xTaskGetStackStart(cur_task);
 +#else
 +    snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);