diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index 4d71c1f1f..2e3357aab 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -202,7 +202,7 @@ A host-based chip-tool can be used as a commissioner to commission and control a
 
 ::
 
-   ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/examples/chip-tool/out
+   $ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/out/host
 
 2.2.1.1 Commissioning
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/export.sh b/export.sh
index a31f6c65f..1c2c99e09 100644
--- a/export.sh
+++ b/export.sh
@@ -50,8 +50,8 @@ esp_matter_export_main() {
      # PATH for gn
      export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/.environment/cipd/packages/pigweed/
 
-    # PATH for chip-tool
-    export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/examples/chip-tool/out/
+    # PATH for host tools
+    export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/out/host
 }
 
 esp_matter_export_main
diff --git a/install.sh b/install.sh
index 100824dd5..ce747362d 100755
--- a/install.sh
+++ b/install.sh
@@ -4,21 +4,28 @@ set -e
 
 basedir=$(dirname "$0")
 ESP_MATTER_PATH=$(cd "${basedir}"; pwd)
+MATTER_PATH=${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip
 export ESP_MATTER_PATH
 
 echo ""
 echo "Running Matter Setup"
 echo ""
-source ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/scripts/bootstrap.sh
+source ${MATTER_PATH}/scripts/bootstrap.sh
 
 echo ""
-echo "Building chip-tool"
+echo "Building host tools"
 echo ""
-${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/scripts/examples/gn_build_example.sh ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/examples/chip-tool ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/examples/chip-tool/out/
+gn --root="${MATTER_PATH}" gen ${MATTER_PATH}/out/host
+ninja -C ${MATTER_PATH}/out/host
 echo ""
-echo "Created chip-tool executable at: ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/examples/chip-tool/out/"
+echo "Host tools built at: ${MATTER_PATH}/out/host"
 echo ""
 
+echo ""
+echo "Installing python dependencies for mfg_tool"
+echo ""
+python3 -m pip install -r ${ESP_MATTER_PATH}/tools/mfg_tool/requirements.txt
+
 echo "All done! You can now run:"
 echo ""
 echo "  . ${basedir}/export.sh"