diff --git a/source/includes/options-conf.yaml b/source/includes/options-conf.yaml
index 32692c994ac..8d4606ea33f 100644
--- a/source/includes/options-conf.yaml
+++ b/source/includes/options-conf.yaml
@@ -1774,20 +1774,10 @@ program: conf
 name: security.kmip.clientCertificateSelector
 directive: setting
 type:  string
-description: |
-
-  .. versionadded:: 4.0
-
-  Specifies the selector and value to search when using Windows or 
-  macOS system certificate store mechanisms for client certificates.
-  
-  This option must be followed by a key value pair indicated by
-  <parameter>=<value>. In this case, <parameter> is the name of the
-  selector.
-
-  .. include:: /includes/option-ssl-certificateSelector.rst
-
-  .. include:: /includes/fact-enterprise-only-admonition.rst
+inherit:
+  name: kmipClientCertificateSelector
+  program: mongod
+  file: options-mongod.yaml
 ---
 program: conf
 name: security.kmip.keyIdentifier
diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml
index d1de8c93503..6ada85c76fe 100644
--- a/source/includes/options-mongod.yaml
+++ b/source/includes/options-mongod.yaml
@@ -2875,5 +2875,25 @@ post: |
    
    For the corresponding configuration file setting, see
    :setting:`cloud.monitoring.free.tag`.
+---
+program: mongod
+name: kmipClientCertificateSelector
+args: <string>
+directive: option
+optional: true
+description: |
+
+  .. versionadded:: 4.0
+
+  Specifies the selector and value to search when using Windows or 
+  macOS system certificate store mechanisms for client certificates.
+  
+  This option must be followed by a key value pair indicated by
+  <parameter>=<value>. In this case, <parameter> is the name of the
+  selector.
+
+  .. include:: /includes/option-ssl-certificateSelector.rst
+
+  .. include:: /includes/fact-enterprise-only-admonition.rst
 
 ...
diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt
index dcb6cb78670..0153128611c 100644
--- a/source/reference/configuration-options.txt
+++ b/source/reference/configuration-options.txt
@@ -412,6 +412,7 @@ Core Options
          port: <string>
          clientCertificateFile: <string>
          clientCertificatePassword: <string>
+         clientCertificateSelector: <string>
          serverCAFile: <string>
       ldap:
          servers: <string>
@@ -457,6 +458,7 @@ Key Management Configuration Options
          port: <string>
          clientCertificateFile: <string>
          clientCertificatePassword: <string>
+         clientCertificateSelector: <string>
          serverCAFile: <string>
 
 .. include:: /includes/option/setting-conf-security.enableEncryption.rst
@@ -477,7 +479,7 @@ Key Management Configuration Options
 
 .. include:: /includes/option/setting-conf-security.kmip.clientCertificatePassword.rst
 
-.. include:: /includes/option/setting-conf-security.kmmip.clientCertificateSelector.rst
+.. include:: /includes/option/setting-conf-security.kmip.clientCertificateSelector.rst
 
 .. include:: /includes/option/setting-conf-security.kmip.serverCAFile.rst
 
diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt
index f331148d3bd..92f22959e38 100644
--- a/source/reference/program/mongod.txt
+++ b/source/reference/program/mongod.txt
@@ -340,12 +340,10 @@ Encryption Key Management Options
 
 .. include:: /includes/option/option-mongod-kmipPort.rst
 
-.. include:: /includes/option/option-mongod-kmipClientCertificateFile.rst
+.. include:: /includes/option/option-mongod-kmipClientCertificateSelector.rst
 
 .. include:: /includes/option/option-mongod-kmipClientCertificatePassword.rst
 
-.. include:: /includes/option/option-mongod-kmipClientCertificateSelector.rst
-
 .. include:: /includes/option/option-mongod-kmipServerCAFile.rst
 
 Text Search Options
diff --git a/source/tutorial/configure-ssl-clients.txt b/source/tutorial/configure-ssl-clients.txt
index d9eca86a4dc..9021221cbb8 100644
--- a/source/tutorial/configure-ssl-clients.txt
+++ b/source/tutorial/configure-ssl-clients.txt
@@ -58,9 +58,8 @@ settings, including:
 - :option:`--sslCertificateSelector <mongo --sslCertificateSelector>` option if you
   wish to use the system store for clients running on macOS or Windows.
 
-.. include:: /includes/extracts/mongo-ssl-options-configure.rst
+.. include:: /includes/extracts/ssl-facts-mongo-ssl-options-configure.rst
 
-.. include:: /includes/extracts/clients-warning-sslCAFile.rst
 
 For a complete list of the :binary:`~bin.mongo` shell's TLS/SSL settings, see
 :ref:`mongo-shell-ssl`.
diff --git a/source/tutorial/configure-ssl.txt b/source/tutorial/configure-ssl.txt
index cfefad241ac..9fcfc6db1d3 100644
--- a/source/tutorial/configure-ssl.txt
+++ b/source/tutorial/configure-ssl.txt
@@ -113,7 +113,7 @@ Procedures
 .. versionadded:: 4.0
 
 Using System Stores for Storing Keys and Certificates for macOS and Windows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. include:: /includes/ssl-trusted-store.rst