diff --git a/docs/guides/chip_tool_guide.md b/docs/guides/chip_tool_guide.md
index 32ce669d538a68..31aa29353c91ab 100644
--- a/docs/guides/chip_tool_guide.md
+++ b/docs/guides/chip_tool_guide.md
@@ -18,6 +18,10 @@ directory.
> `/tmp/chip_tool_config.ini` file. Deleting this and other `.ini` files in the
> `/tmp` directory can sometimes resolve issues related to stale configuration.
+> **Note:** To make the configuration persistent (since `/tmp` directory might
+> be flushed at each reboot) you can change the directory where CHIP Tool caches
+> its configuration by using the option `--storage-directory`
+
## Building and running the CHIP Tool
@@ -676,6 +680,30 @@ The following flags are available:
+##### Changing storage directory
+
+By default, CHIP Tool stores its configuration into the `/tmp` directory. You
+can change the storage directory by using the `--storage-directory` flag.
+
+Usage:
+
+```
+--storage-directory
+```
+
+Here, __ is the path to the directory where the configuration is
+stored.
+
+**Example of usage:**
+
+```
+$ ./chip-tool pairing ble-wifi --storage-directory
+$ ./chip-tool temperaturemeasurement read measured-value --storage-directory
+
+```
+
+
+
### Commissioner name and ID flags
All CHIP Tool commands can be used together with the following