diff --git a/export.sh b/export.sh
index d5c4f26d1..631d19883 100644
--- a/export.sh
+++ b/export.sh
@@ -52,6 +52,9 @@ esp_matter_export_main() {
 
     # PATH for host tools
     export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/out/host
+
+    # export zap-cli path
+    export export ZAP_INSTALL_PATH=${ESP_MATTER_PATH}/zap
 }
 
 esp_matter_export_main
diff --git a/install.sh b/install.sh
index 356ce810f..55922ff5b 100755
--- a/install.sh
+++ b/install.sh
@@ -36,6 +36,20 @@ echo "Installing python dependencies for Matter"
 echo ""
 python3 -m pip install -r ${ESP_MATTER_PATH}/requirements.txt
 
+echo ""
+echo "Installing zap-cli"
+echo ""
+# Run the zap_download.py and extract the path of installed binary
+# eg output before cut: "export ZAP_INSTALL_PATH=zap/zap-v2023.01.19-nightly"
+# output after cut: zap/zap-v2023.01.19-nightly
+zap_path=`python3 connectedhomeip/connectedhomeip/scripts/tools/zap/zap_download.py \
+    --sdk-root connectedhomeip/connectedhomeip --zap RELEASE --extract-root zap \
+    2>/dev/null | cut -d= -f2`
+# Move files to one directory up, so that binaries will be in zap/ directory and export.sh can leverage the fixed path
+mv $zap_path/* zap/
+rm -r $zap_path
+chmod +x zap/zap-cli
+
 echo "All done! You can now run:"
 echo ""
 echo "  . ${basedir}/export.sh"