diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md
index 65b59875a..59f86a60e 100644
--- a/PendingReleaseNotes.md
+++ b/PendingReleaseNotes.md
@@ -1,10 +1,9 @@
# v3.15 Pending Release Notes
-## Breaking Changes
-
-- Support for `secret.adminID` and `secret.adminKey` has been deprecated and removed
- from Helm charts. Please use `secret.userID` and `secret.userKey` instead.
+## Breaking changes
## Features
## NOTE
+
+- `--setmetadata` flag has been set to true by default.
diff --git a/cmd/cephcsi.go b/cmd/cephcsi.go
index 1fe31e136..07afc84ad 100644
--- a/cmd/cephcsi.go
+++ b/cmd/cephcsi.go
@@ -74,7 +74,7 @@ func init() {
flag.StringVar(&conf.PluginPath, "pluginpath", defaultPluginPath, "plugin path")
flag.StringVar(&conf.StagingPath, "stagingpath", defaultStagingPath, "staging path")
flag.StringVar(&conf.ClusterName, "clustername", "", "name of the cluster")
- flag.BoolVar(&conf.SetMetadata, "setmetadata", false, "set metadata on the volume")
+ flag.BoolVar(&conf.SetMetadata, "setmetadata", true, "set metadata on the volume")
flag.StringVar(&conf.InstanceID, "instanceid", "default", "Unique ID distinguishing this instance of Ceph-CSI"+
" among other instances, when sharing Ceph clusters across CSI instances for provisioning")
flag.IntVar(&conf.PidLimit, "pidlimit", 0, "the PID limit to configure through cgroups")
diff --git a/docs/cephfs/deploy.md b/docs/cephfs/deploy.md
index e190fa764..d3f0b36a2 100644
--- a/docs/cephfs/deploy.md
+++ b/docs/cephfs/deploy.md
@@ -48,6 +48,7 @@ make image-cephcsi
| `--fusemountoptions` | _empty_ | Comma separated string of mount options accepted by ceph-fuse mounter.
`Note: These options will be replaced if fuseMountOptions are defined in the ceph-csi-config ConfigMap for the specific cluster.` |
| `--domainlabels` | _empty_ | Kubernetes node labels to use as CSI domain labels for topology aware provisioning, should be a comma separated value (ex:= "failure-domain/region,failure-domain/zone") |
| `--enable-read-affinity` | `false` | enable read affinity |
+|`--setmetadata` | `true` | Set metadata on volume |
| `--crush-location-labels`| _empty_ | Kubernetes node labels that determine the CRUSH location the node belongs to, separated by ','.
`Note: These labels will be replaced if crush location labels are defined in the ceph-csi-config ConfigMap for the specific cluster.` |
| `--radosnamespacecephfs`| _empty_ | CephFS RadosNamespace used to store CSI specific objects and keys. |
| `--logslowopinterval` | `30s` | Log slow operations at the specified rate. Operation is considered slow if it outlives its deadline. |
diff --git a/docs/rbd/deploy.md b/docs/rbd/deploy.md
index 02bfea157..a730dd1e1 100644
--- a/docs/rbd/deploy.md
+++ b/docs/rbd/deploy.md
@@ -45,7 +45,7 @@ make image-cephcsi
| `--rbdsoftmaxclonedepth` | `4` | Soft limit for maximum number of nested volume clones that are taken before a flatten occurs |
| `--skipforceflatten` | `false` | skip image flattening on kernel < 5.2 which support mapping of rbd images which has the deep-flatten feature |
| `--maxsnapshotsonimage` | `450` | Maximum number of snapshots allowed on rbd image without flattening |
-| `--setmetadata` | `false` | Set metadata on volume |
+| `--setmetadata` | `true` | Set metadata on volume |
| `--enable-read-affinity` | `false` | enable read affinity |
| `--crush-location-labels`| _empty_ | Kubernetes node labels that determine the CRUSH location the node belongs to, separated by ','.
`Note: These labels will be replaced if crush location labels are defined in the ceph-csi-config ConfigMap for the specific cluster.` |
| `--logslowopinterval` | `30s` | Log slow operations at the specified rate. Operation is considered slow if it outlives its deadline. |