diff --git a/conf/bookkeeper.conf b/conf/bookkeeper.conf
index 4058d787e2c00..8503694cb7c21 100644
--- a/conf/bookkeeper.conf
+++ b/conf/bookkeeper.conf
@@ -661,10 +661,13 @@ diskCheckInterval=10000
 # Examples:
 #  - metadataServiceUri=zk+hierarchical://my-zk-1:2181/ledgers
 #  - metadataServiceUri=etcd+hierarchical:http://my-etcd:2379
-#  - metadataServiceUri=metadata-store:zk:my-zk-1:2281
+#  - metadataServiceUri=metadata-store:zk:my-zk-1:2281/ledgers
+#  - metadataServiceUri=metadata-store:oxia://oxia-server:6648/bookkeeper
 # If you use metadata-store configuration, you need to configure following items in JVM option:
 # -Dbookkeeper.metadata.client.drivers=org.apache.pulsar.metadata.bookkeeper.PulsarMetadataClientDriver
 # -Dbookkeeper.metadata.bookie.drivers=org.apache.pulsar.metadata.bookkeeper.PulsarMetadataBookieDriver
+# These are JVM options are set by default when BookKeeper components or tools are started with bin/pulsar or
+# bin/bookkeeper scripts included in the the Pulsar distribution
 metadataServiceUri=
 
 # @Deprecated - `ledgerManagerFactoryClass` is deprecated in favor of using `metadataServiceUri`
diff --git a/conf/broker.conf b/conf/broker.conf
index c117596445dd2..33232b9ad7542 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -1031,6 +1031,11 @@ maxConcurrentHttpRequests=1024
 # For example: zk+hierarchical://localhost:2181/ledgers
 # The metadata service uri list can also be semicolon separated values like below:
 # zk+hierarchical://zk1:2181;zk2:2181;zk3:2181/ledgers
+# For using Pulsar's default Metadata Client Driver for BookKeeper, the URI starts with "metadata-store:".
+# Examples:
+# - metadata-store:zk:zk1:2181,zk2:2181,zk3:2181/ledgers
+# - metadata-store:oxia://oxia-server:6648/bookkeeper
+# When the value is empty, the broker will default to using broker's metadataStoreUrl config appended with "/ledgers"
 bookkeeperMetadataServiceUri=
 
 # Authentication plugin to use when connecting to bookies
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
index 45299d9ed05d5..90615eebb3cd0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
@@ -126,6 +126,7 @@ ClientConfiguration createBkClientConfiguration(MetadataStoreExtended store, Ser
         bkConf.setBusyWaitEnabled(conf.isEnableBusyWait());
         bkConf.setNumWorkerThreads(conf.getBookkeeperClientNumWorkerThreads());
         bkConf.setThrottleValue(conf.getBookkeeperClientThrottleValue());
+        bkConf.setZkTimeout((int) conf.getMetadataStoreSessionTimeoutMillis());
         bkConf.setAddEntryTimeout((int) conf.getBookkeeperClientTimeoutInSeconds());
         bkConf.setReadEntryTimeout((int) conf.getBookkeeperClientTimeoutInSeconds());
         bkConf.setSpeculativeReadTimeout(conf.getBookkeeperClientSpeculativeReadTimeoutInMillis());