diff --git a/docs/api.asciidoc b/docs/api.asciidoc
index 24f7e082c..55c648b85 100644
--- a/docs/api.asciidoc
+++ b/docs/api.asciidoc
@@ -72,7 +72,7 @@ except ValueError:
  * `exc_info`: A `(type, value, traceback)` tuple as returned by https://docs.python.org/3/library/sys.html#sys.exc_info[`sys.exc_info()`]. If not provided, it will be captured automatically.
  * `date`: A `datetime.datetime` object representing the occurrence time of the error. If left empty, it defaults to `datetime.datetime.utcnow()`.
  * `context`: A dictionary with contextual information. This dictionary must follow the
-    {apm-guide-ref}/events-api.html#events-api-errors[Context] schema definition.
+    {apm-guide-ref}/api-error.html[Context] schema definition.
  * `custom`: A dictionary of custom data you want to attach to the event.
  * `handled`: A boolean to indicate if this exception was handled or not.
 
@@ -112,7 +112,7 @@ client.capture_message(param_message={
  * `date`: A `datetime.datetime` object representing the occurrence time of the error.
    If left empty, it defaults to `datetime.datetime.utcnow()`.
  * `context`: A dictionary with contextual information. This dictionary must follow the
-    {apm-guide-ref}/events-api.html#events-api-errors[Context] schema definition.
+    {apm-guide-ref}/api-events.html#events-api-errors[Context] schema definition.
  * `custom`: A dictionary of custom data you want to attach to the event.
 
 Returns the id of the message as a string.
@@ -395,7 +395,7 @@ Supported frameworks will automatically attach information about the HTTP reques
 You can attach further data using this function.
 
 TIP: Before using custom context, ensure you understand the different types of
-{apm-guide-ref}/metadata.html[metadata] that are available.
+{apm-guide-ref}/data-model-metadata.html[metadata] that are available.
 
 Example:
 
@@ -528,7 +528,7 @@ NOTE: `asyncio` is only supported for Python 3.7+.
 Attach labels to the the current transaction and errors.
 
 TIP: Before using custom labels, ensure you understand the different types of
-{apm-guide-ref}/metadata.html[metadata] that are available.
+{apm-guide-ref}/data-model-metadata.html[metadata] that are available.
 
 Example:
 
diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
index be1e5a766..65aa4df90 100644
--- a/docs/configuration.asciidoc
+++ b/docs/configuration.asciidoc
@@ -1189,7 +1189,7 @@ behavior by setting this to `True`.
 | `ELASTIC_APM_USE_ELASTIC_TRACEPARENT_HEADER` | `USE_ELASTIC_TRACEPARENT_HEADER` | `True`
 |============
 
-To enable {apm-guide-ref}/distributed-tracing.html[distributed tracing],
+To enable {apm-guide-ref}/apm-distributed-tracing.html[distributed tracing],
 the agent sets a number of HTTP headers to outgoing requests made with <<automatic-instrumentation-http,instrumented HTTP libraries>>.
 These headers (`traceparent` and `tracestate`) are defined in the https://www.w3.org/TR/trace-context-1/[W3C Trace Context] specification.
 
diff --git a/docs/opentelemetry.asciidoc b/docs/opentelemetry.asciidoc
index 2552237ab..531fd09d4 100644
--- a/docs/opentelemetry.asciidoc
+++ b/docs/opentelemetry.asciidoc
@@ -6,8 +6,8 @@ using the OpenTelemetry API. This allows users to utilize the Elastic APM agent'
 automatic instrumentations, while keeping custom instrumentations vendor neutral.
 
 If a span is created while there is no transaction active, it will result in an
-Elastic APM {apm-guide-ref}/transactions.html[`Transaction`]. Inner spans
-are mapped to Elastic APM {apm-guide-ref}/transaction-spans.html[`Span`].
+Elastic APM {apm-guide-ref}/data-model-transactions.html[`Transaction`]. Inner spans
+are mapped to Elastic APM {apm-guide-ref}/data-model-spans.html[`Span`].
 
 [float]
 [[opentelemetry-getting-started]]
@@ -74,4 +74,3 @@ Additionally, due to implementation details, the global context API only works
 when a span is included in the activated context, and tokens are not used.
 Instead, the global context works as a stack, and when a context is detached the
 previously-active context will automatically be activated.
-