diff --git a/doc-Service-Telemetry-Framework/assemblies/assembly_completing-the-stf-configuration.adoc b/doc-Service-Telemetry-Framework/assemblies/assembly_completing-the-stf-configuration.adoc
index 8e38becb..7c8b85a3 100644
--- a/doc-Service-Telemetry-Framework/assemblies/assembly_completing-the-stf-configuration.adoc
+++ b/doc-Service-Telemetry-Framework/assemblies/assembly_completing-the-stf-configuration.adoc
@@ -30,7 +30,9 @@ As part of an {OpenStack} overcloud deployment, you might need to configure addi
 
 * To deploy data collection and transport to {ProjectShort} on {OpenStack} cloud nodes that employ routed L3 domains, such as distributed compute node (DCN) or spine-leaf, see xref:deploying-to-non-standard-network-topologies_assembly-completing-the-stf-configuration[].
 
+ifdef::include_when_16[]
 * To send metrics to both Gnocchi and {ProjectShort}, see xref:sending-metrics-to-gnocchi-and-to-stf_assembly-completing-the-stf-configuration[].
+endif::include_when_16[]
 
 ifdef::include_when_13[]
 * If you synchronized container images to a local registry, you must create an environment file and include the paths to the container images. For more information, see xref:adding-container-images-to-the-undercloud_assembly-completing-the-stf-configuration[].
@@ -48,7 +50,9 @@ include::../modules/proc_deploying-the-overcloud.adoc[leveloffset=+2]
 include::../modules/proc_validating-clientside-installation.adoc[leveloffset=+2]
 
 //Sending metrics to Gnocchi and to STF
+ifdef::include_when_16[]
 include::../modules/proc_sending-metrics-to-gnocchi-and-to-stf.adoc[leveloffset=+1]
+endif::include_when_16[]
 
 // Gather information for deployment in non-standard network topologies in the OSP overcloud
 include::../modules/proc_deploying-to-non-standard-network-topologies.adoc[leveloffset=+1]
diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc
index 28c0d43a..a3d658b4 100644
--- a/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc
+++ b/doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc
@@ -37,7 +37,9 @@ To configure the base parameters to provide a compatible data collection and tra
 ====
 Setting `EventPipelinePublishers` and `PipelinePublishers` to empty lists results in no event or metric data passing to {OpenStack} legacy telemetry components, such as Gnocchi or Panko. If you need to send data to additional pipelines, the Ceilometer polling interval of 30 seconds as specified in `ExtraConfig` might overwhelm the legacy components, and should be increased to a larger value such as `300`. Increasing the value to a longer polling interval will result in less telemetry resolution in {ProjectShort}.
 
+ifdef::include_when_16[]
 To enable collection of telemetry with {ProjectShort} and Gnocchi, see xref:sending-metrics-to-gnocchi-and-to-stf_assembly-completing-the-stf-configuration[]
+endif::include_when_16[]
 ====
 +
 ifdef::include_when_13[]