diff --git a/platformio.ini b/platformio.ini
index 2455206..2939a01 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,11 +16,6 @@ boards_dir = boards
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30/platform-espressif32.zip
 platform_packages =
 framework = arduino, espidf
-board_build.embed_txtfiles =
-    managed_components/espressif__esp_insights/server_certs/https_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 build_type = release
 custom_build = release
 board_build.partitions = partitions.csv
@@ -50,6 +45,28 @@ build_flags =
     -Wno-maybe-uninitialized
     -Wno-implicit-fallthrough
     -Wno-unused-result
+custom_component_remove =
+    espressif/esp_hosted
+    espressif/esp_wifi_remote
+    espressif/esp_rainmaker
+    espressif/rmaker_common
+    espressif/esp_insights
+    espressif/esp_diag_data_store
+    espressif/esp_diagnostics
+    espressif/esp-cbor
+    espressif/esp-sr
+    espressif/esp32-camera
+    chmorgan/esp-libhelix-mp3
+    espressif/eppp_link
+    espressif/esp_modem
+    espressif/esp_serial_slave_link
+    espressif/esp-dsp
+    espressif/esp-modbus
+    espressif/network_provisioning
+	joltwallet/littlefs
+    espressif/esp-zboss-lib
+    espressif/esp-zigbee-lib
+    espressif/qrcode
 lib_deps =
     BleScanner=symlink://lib/BleScanner
 lib_ignore =
@@ -173,6 +190,26 @@ board_build.embed_txtfiles =
 board = esp32-p4
 board_build.cmake_extra_args =
     -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.release.defaults;sdkconfig.ramoptimize.defaults;sdkconfig.defaults.esp32-p4"
+custom_component_remove =
+    espressif/esp_rainmaker
+    espressif/rmaker_common
+    espressif/esp_insights
+    espressif/esp_diag_data_store
+    espressif/esp_diagnostics
+    espressif/esp-cbor
+    espressif/esp-sr
+    espressif/esp32-camera
+    chmorgan/esp-libhelix-mp3
+    espressif/eppp_link
+    espressif/esp_modem
+    espressif/esp_serial_slave_link
+    espressif/esp-dsp
+    espressif/esp-modbus
+    espressif/network_provisioning
+    joltwallet/littlefs
+    espressif/esp-zboss-lib
+    espressif/esp-zigbee-lib
+    espressif/qrcode
 
 [env:esp32_dbg]
 extends = env:esp32
diff --git a/src/idf_component.yml b/src/idf_component.yml
index 269b8c2..5b0471d 100644
--- a/src/idf_component.yml
+++ b/src/idf_component.yml
@@ -9,7 +9,7 @@ dependencies:
   espressif/libsodium: "^1.0.20~2"
 
   espressif/esp_hosted:
-    version: "*"
+    version: "2.0.17"
     #override_path: "../resources/espressif__esp_hosted"
     rules:
       - if: "target in [esp32p4]"
diff --git a/updater/platformio.ini b/updater/platformio.ini
index 1fc528c..153a7ef 100644
--- a/updater/platformio.ini
+++ b/updater/platformio.ini
@@ -16,16 +16,11 @@ boards_dir = ../boards
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30/platform-espressif32.zip
 platform_packages =
 framework = arduino, espidf
-board_build.embed_txtfiles =
-    managed_components/espressif__esp_insights/server_certs/https_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 build_type = release
 custom_build = release
 board_build.partitions = partitions.csv
 build_unflags =
-    -DESP32 
+    -DESP32
     -Werror=all
     -Wall
 build_flags =
@@ -43,6 +38,28 @@ build_flags =
     -Wno-maybe-uninitialized
     -Wno-implicit-fallthrough
     -Wno-unused-result
+custom_component_remove =
+    espressif/esp_hosted
+    espressif/esp_wifi_remote
+    espressif/esp_rainmaker
+    espressif/rmaker_common
+    espressif/esp_insights
+    espressif/esp_diag_data_store
+    espressif/esp_diagnostics
+    espressif/esp-cbor
+    espressif/esp-sr
+    espressif/esp32-camera
+    chmorgan/esp-libhelix-mp3
+    espressif/eppp_link
+    espressif/esp_modem
+    espressif/esp_serial_slave_link
+    espressif/esp-dsp
+    espressif/esp-modbus
+    espressif/network_provisioning
+    joltwallet/littlefs
+    espressif/esp-zboss-lib
+    espressif/esp-zigbee-lib
+    espressif/qrcode
 lib_ignore =
     BLE
     BluetoothSerial
@@ -61,7 +78,7 @@ monitor_filters =
 
 [env:updater_esp32]
 board = nuki-esp32dev
-extra_scripts = 
+extra_scripts =
      pre:pio_package_pre.py
      post:pio_package_post.py
 board_build.cmake_extra_args =
@@ -72,7 +89,7 @@ build_flags =
 
 [env:updater_esp32-nopsram]
 board = nuki-esp32dev-nopsram
-extra_scripts = 
+extra_scripts =
      pre:pio_package_pre.py
      post:pio_package_post.py
 board_build.cmake_extra_args =
@@ -133,11 +150,31 @@ board_build.embed_txtfiles =
 board = esp32-p4
 board_build.cmake_extra_args =
     -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.defaults.esp32-p4"
+custom_component_remove =
+    espressif/esp_rainmaker
+    espressif/rmaker_common
+    espressif/esp_insights
+    espressif/esp_diag_data_store
+    espressif/esp_diagnostics
+    espressif/esp-cbor
+    espressif/esp-sr
+    espressif/esp32-camera
+    chmorgan/esp-libhelix-mp3
+    espressif/eppp_link
+    espressif/esp_modem
+    espressif/esp_serial_slave_link
+    espressif/esp-dsp
+    espressif/esp-modbus
+    espressif/network_provisioning
+    joltwallet/littlefs
+    espressif/esp-zboss-lib
+    espressif/esp-zigbee-lib
+    espressif/qrcode
 
 [env:updater_esp32-h2]
 extends = env:updater_esp32
 board = esp32-h2-devkitm-1
-board_build.cmake_extra_args = 
+board_build.cmake_extra_args =
     -DNUKI_TARGET_H2=y
 build_flags =
     ${env.build_flags}
diff --git a/updater/src/idf_component.yml b/updater/src/idf_component.yml
index 9b3fc41..1512669 100644
--- a/updater/src/idf_component.yml
+++ b/updater/src/idf_component.yml
@@ -3,7 +3,7 @@ dependencies:
   idf: ">=5.5"
 
   espressif/esp_hosted:
-    version: "*"
+    version: "2.0.17"
     #override_path: "../../resources/espressif__esp_hosted"
     rules:
       - if: "target in [esp32p4]"