diff --git a/docset.yml b/docset.yml
index cd506a293a..b66e11ea7a 100644
--- a/docset.yml
+++ b/docset.yml
@@ -11,6 +11,7 @@ cross_links:
   - apm-agent-dotnet
   - apm-agent-go
   - apm-agent-ios
+  - apm-agent-java
   - apm-agent-rum-js
   - apm-aws-lambda
   - apm-k8s-attacher
diff --git a/raw-migrated-files/docs-content/serverless/observability-apm-get-started.md b/raw-migrated-files/docs-content/serverless/observability-apm-get-started.md
index c78944043c..f5c118e0a1 100644
--- a/raw-migrated-files/docs-content/serverless/observability-apm-get-started.md
+++ b/raw-migrated-files/docs-content/serverless/observability-apm-get-started.md
@@ -118,12 +118,12 @@ To send APM data to Elastic, you must install an APM agent and configure it to s
         java -javaagent:/path/to/elastic-apm-agent-<version>.jar -Delastic.apm.service_name=my-cool-service -Delastic.apm.application_packages=org.example,org.another.example -Delastic.apm.server_url=http://127.0.0.1:8200 -jar my-application.jar
         ```
 
-        Refer to [Manual setup with `-javaagent` flag](asciidocalypse://docs/apm-agent-java/docs/reference/setup-javaagent.md) to learn more.
+        Refer to [Manual setup with `-javaagent` flag](apm-agent-java://reference/setup-javaagent.md) to learn more.
 
         **Alternate setup methods**
 
-        * **Automatic setup with `apm-agent-attach-cli.jar`** Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-cli.md) for more information on this setup method.
-        * **Programmatic API setup to self-attach** Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-api.md) for more information on this setup method.
+        * **Automatic setup with `apm-agent-attach-cli.jar`** Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-cli.md) for more information on this setup method.
+        * **Programmatic API setup to self-attach** Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-api.md) for more information on this setup method.
 
           </div>
           <div tabindex="0" role="tabpanel" id="apm-apm-get-started-net-panel" aria-labelledby="apm-apm-get-started-net-button" hidden="">
diff --git a/raw-migrated-files/docs-content/serverless/observability-ecs-application-logs.md b/raw-migrated-files/docs-content/serverless/observability-ecs-application-logs.md
index ae2dfc6f70..2c45a455be 100644
--- a/raw-migrated-files/docs-content/serverless/observability-ecs-application-logs.md
+++ b/raw-migrated-files/docs-content/serverless/observability-ecs-application-logs.md
@@ -41,7 +41,7 @@ To set up log ECS reformatting:
 
 Log ECS reformatting is controlled by the `log_ecs_reformatting` configuration option, and is disabled by default. Refer to the guide for your framework for information on enabling:
 
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md#config-log-ecs-reformatting)
+* [Java](apm-agent-java://reference/config-logging.md#config-log-ecs-reformatting)
 * [Ruby](asciidocalypse://docs/apm-agent-ruby/docs/reference/configuration.md#config-log-ecs-formatting)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-log_ecs_reformatting)
 
diff --git a/raw-migrated-files/docs-content/serverless/observability-plaintext-application-logs.md b/raw-migrated-files/docs-content/serverless/observability-plaintext-application-logs.md
index 03ead5b5fa..daa214cc00 100644
--- a/raw-migrated-files/docs-content/serverless/observability-plaintext-application-logs.md
+++ b/raw-migrated-files/docs-content/serverless/observability-plaintext-application-logs.md
@@ -386,7 +386,7 @@ Log correlation works on two levels:
 Learn about correlating plaintext logs in the agent-specific ingestion guides:
 
 * [Go](apm-agent-go://reference/logs.md)
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/logs.md#log-correlation-ids)
+* [Java](apm-agent-java://reference/logs.md#log-correlation-ids)
 * [.NET](apm-agent-dotnet://reference/logs.md)
 * [Node.js](asciidocalypse://docs/apm-agent-nodejs/docs/reference/logs.md)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/logs.md#log-correlation-ids)
diff --git a/solutions/observability/apps/api-keys.md b/solutions/observability/apps/api-keys.md
index 010afda026..9298a5abe7 100644
--- a/solutions/observability/apps/api-keys.md
+++ b/solutions/observability/apps/api-keys.md
@@ -110,7 +110,7 @@ You can now apply your newly created API keys in the configuration of each of yo
 * **Go agent**: [`ELASTIC_APM_API_KEY`](apm-agent-go://reference/configuration.md#config-api-key)
 * **.NET agent**: [`ApiKey`](apm-agent-dotnet://reference/config-reporter.md#config-api-key)
 * **iOS**: [`withApiKey`](apm-agent-ios://reference/configuration.md#withapikey)
-* **Java agent**: [`api_key`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-api-key)
+* **Java agent**: [`api_key`](apm-agent-java://reference/config-reporter.md#config-api-key)
 * **Node.js agent**: [`apiKey`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#api-key)
 * **PHP agent**: [`api_key`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-api-key)
 * **Python agent**: [`api_key`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-api-key)
diff --git a/solutions/observability/apps/apm-agent-central-configuration.md b/solutions/observability/apps/apm-agent-central-configuration.md
index ffdaae2e53..f354c20274 100644
--- a/solutions/observability/apps/apm-agent-central-configuration.md
+++ b/solutions/observability/apps/apm-agent-central-configuration.md
@@ -41,7 +41,7 @@ iOS agent
 :   [Configuration reference](apm-agent-ios://reference/configuration.md)
 
 Java agent
-:   [Configuration reference](asciidocalypse://docs/apm-agent-java/docs/reference/configuration.md)
+:   [Configuration reference](apm-agent-java://reference/configuration.md)
 
 .NET agent
 :   [Configuration reference](apm-agent-dotnet://reference/configuration.md)
diff --git a/solutions/observability/apps/apm-agent-tls-communication.md b/solutions/observability/apps/apm-agent-tls-communication.md
index 51bca9cf27..2553c35520 100644
--- a/solutions/observability/apps/apm-agent-tls-communication.md
+++ b/solutions/observability/apps/apm-agent-tls-communication.md
@@ -60,13 +60,13 @@ When the APM server uses a certificate that is not chained to a publicly-trusted
 * **Ruby agent**: certificate pinning through [`server_ca_cert`](asciidocalypse://docs/apm-agent-ruby/docs/reference/configuration.md#config-ssl-ca-cert)
 * **.NET agent**: [`ServerCert`](apm-agent-dotnet://reference/config-reporter.md#config-server-cert)
 * **Node.js agent**: custom CA setting through [`serverCaCertFile`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#server-ca-cert-file)
-* **Java agent**: adding the certificate to the JVM `trustStore`. See [APM Server authentication](asciidocalypse://docs/apm-agent-java/docs/reference/ssl-configuration.md#ssl-server-authentication) for more details.
+* **Java agent**: adding the certificate to the JVM `trustStore`. See [APM Server authentication](apm-agent-java://reference/ssl-configuration.md#ssl-server-authentication) for more details.
 
 We do not recommend disabling {{apm-agent}} verification of the server’s certificate, but it is possible:
 
 * **Go agent**: [`ELASTIC_APM_VERIFY_SERVER_CERT`](apm-agent-go://reference/configuration.md#config-verify-server-cert)
 * **.NET agent**: [`VerifyServerCert`](apm-agent-dotnet://reference/config-reporter.md#config-verify-server-cert)
-* **Java agent**: [`verify_server_cert`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-verify-server-cert)
+* **Java agent**: [`verify_server_cert`](apm-agent-java://reference/config-reporter.md#config-verify-server-cert)
 * **PHP agent**: [`verify_server_cert`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-verify-server-cert)
 * **Python agent**: [`verify_server_cert`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-verify-server-cert)
 * **Ruby agent**: [`verify_server_cert`](asciidocalypse://docs/apm-agent-ruby/docs/reference/configuration.md#config-verify-server-cert)
diff --git a/solutions/observability/apps/apm-server-binary.md b/solutions/observability/apps/apm-server-binary.md
index a85b4b2c4b..9bbc1eba10 100644
--- a/solutions/observability/apps/apm-server-binary.md
+++ b/solutions/observability/apps/apm-server-binary.md
@@ -383,12 +383,12 @@ Different application servers have different ways of setting the `-javaagent` fl
 java -javaagent:/path/to/elastic-apm-agent-<version>.jar -Delastic.apm.service_name=my-cool-service -Delastic.apm.application_packages=org.example,org.another.example -Delastic.apm.server_url=http://127.0.0.1:8200 -jar my-application.jar
 ```
 
-Refer to [Manual setup with `-javaagent` flag](asciidocalypse://docs/apm-agent-java/docs/reference/setup-javaagent.md) to learn more.
+Refer to [Manual setup with `-javaagent` flag](apm-agent-java://reference/setup-javaagent.md) to learn more.
 
 **Alternate setup methods**
 
-* **Automatic setup with `apm-agent-attach-cli.jar`**<br> Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-cli.md) for more information on this setup method.
-* **Programmatic API setup to self-attach**<br> Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-api.md) for more information on this setup method.
+* **Automatic setup with `apm-agent-attach-cli.jar`**<br> Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-cli.md) for more information on this setup method.
+* **Programmatic API setup to self-attach**<br> Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-api.md) for more information on this setup method.
 ::::::
 
 ::::::{tab-item} .NET
diff --git a/solutions/observability/apps/built-in-data-filters.md b/solutions/observability/apps/built-in-data-filters.md
index 474dff704c..d9a886103f 100644
--- a/solutions/observability/apps/built-in-data-filters.md
+++ b/solutions/observability/apps/built-in-data-filters.md
@@ -25,7 +25,7 @@ The default list of sanitized fields attempts to target common field names for d
 This setting supports [Central configuration](apm-agent-central-configuration.md), which means the list of sanitized fields can be updated without needing to redeploy your services:
 
 * Go: [`ELASTIC_APM_SANITIZE_FIELD_NAMES`](apm-agent-go://reference/configuration.md#config-sanitize-field-names)
-* Java: [`sanitize_field_names`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-sanitize-field-names)
+* Java: [`sanitize_field_names`](apm-agent-java://reference/config-core.md#config-sanitize-field-names)
 * .NET: [`sanitizeFieldNames`](apm-agent-dotnet://reference/config-core.md#config-sanitize-field-names)
 * Node.js: [`sanitizeFieldNames`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#sanitize-field-names)
 * Python: [`sanitize_field_names`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-sanitize-field-names)
@@ -34,7 +34,7 @@ This setting supports [Central configuration](apm-agent-central-configuration.md
 Alternatively, you can completely disable the capturing of HTTP headers. This setting also supports [Central configuration](apm-agent-central-configuration.md):
 
 * Go: [`ELASTIC_APM_CAPTURE_HEADERS`](apm-agent-go://reference/configuration.md#config-capture-headers)
-* Java: [`capture_headers`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-capture-headers)
+* Java: [`capture_headers`](apm-agent-java://reference/config-core.md#config-capture-headers)
 * .NET: [`CaptureHeaders`](apm-agent-dotnet://reference/config-http.md#config-capture-headers)
 * Node.js: [`captureHeaders`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#capture-headers)
 * Python: [`capture_headers`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-capture-headers)
@@ -48,7 +48,7 @@ By default, the body of HTTP requests is not recorded. Request bodies often cont
 This setting supports [Central configuration](apm-agent-central-configuration.md), which means the list of sanitized fields can be updated without needing to redeploy your services:
 
 * Go: [`ELASTIC_APM_CAPTURE_BODY`](apm-agent-go://reference/configuration.md#config-capture-body)
-* Java: [`capture_body`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-capture-body)
+* Java: [`capture_body`](apm-agent-java://reference/config-core.md#config-capture-body)
 * .NET: [`CaptureBody`](apm-agent-dotnet://reference/config-http.md#config-capture-body)
 * Node.js: [`captureBody`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#capture-body)
 * Python: [`capture_body`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-capture-body)
@@ -96,4 +96,4 @@ Certain agents offer additional filtering and obfuscating options:
 **Agent configuration options**
 
 * (Node.js) Remove errors raised by the server-side process: disable with [captureExceptions](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#capture-exceptions).
-* (Java) Remove process arguments from transactions: disabled by default with [`include_process_args`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-include-process-args).
+* (Java) Remove process arguments from transactions: disabled by default with [`include_process_args`](apm-agent-java://reference/config-reporter.md#config-include-process-args).
diff --git a/solutions/observability/apps/elastic-apm-agents.md b/solutions/observability/apps/elastic-apm-agents.md
index 9c27bda838..bb16bf5598 100644
--- a/solutions/observability/apps/elastic-apm-agents.md
+++ b/solutions/observability/apps/elastic-apm-agents.md
@@ -33,12 +33,12 @@ Spans are grouped in transactions—by default, one for each incoming HTTP reque
 
 If you're ready to give Elastic APM a try, see [Get started with traces and APM](../../../solutions/observability/apps/get-started-with-apm.md).
 
-See the [Java agent reference](asciidocalypse://docs/apm-agent-java/docs/reference/index.md) for full documentation, including:
+See the [Java agent reference](apm-agent-java://reference/index.md) for full documentation, including:
 
-* [Supported technologies](asciidocalypse://docs/apm-agent-java/docs/reference/supported-technologies.md)
-* [Set up](asciidocalypse://docs/apm-agent-java/docs/reference/set-up-apm-java-agent.md)
-* [Configuration reference](asciidocalypse://docs/apm-agent-java/docs/reference/configuration.md)
-* [API reference](asciidocalypse://docs/apm-agent-java/docs/reference/tracing-apis.md)
+* [Supported technologies](apm-agent-java://reference/supported-technologies.md)
+* [Set up](apm-agent-java://reference/set-up-apm-java-agent.md)
+* [Configuration reference](apm-agent-java://reference/configuration.md)
+* [API reference](apm-agent-java://reference/tracing-apis.md)
 
 ::::{important}
 Not all APM agent configuration options are compatible with Elastic Cloud serverless.
diff --git a/solutions/observability/apps/filter-application-data.md b/solutions/observability/apps/filter-application-data.md
index f511509b74..1d4869e4eb 100644
--- a/solutions/observability/apps/filter-application-data.md
+++ b/solutions/observability/apps/filter-application-data.md
@@ -36,7 +36,7 @@ Service environments are defined when configuring your APM agents. It’s vital
 
 * **Go:** [`ELASTIC_APM_ENVIRONMENT`](apm-agent-go://reference/configuration.md#config-environment)
 * **iOS agent:** *Not yet supported*
-* **Java:** [`environment`](asciidocalypse://docs/apm-agent-java/docs/reference/ingestion-tools/apm-agent-java/config-core.md#config-environment)
+* **Java:** [`environment`](apm-agent-java://reference/config-core.md#config-environment)
 * **.NET:** [`Environment`](apm-agent-dotnet://reference/config-core.md#config-environment)
 * **Node.js:** [`environment`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/ingestion-tools/apm-agent-nodejs/configuration.md#environment)
 * **PHP:** [`environment`](asciidocalypse://docs/apm-agent-php/docs/reference/ingestion-tools/apm-agent-php/configuration-reference.md#config-environment)
diff --git a/solutions/observability/apps/fleet-managed-apm-server.md b/solutions/observability/apps/fleet-managed-apm-server.md
index e76a4be7ad..12d2e29ecf 100644
--- a/solutions/observability/apps/fleet-managed-apm-server.md
+++ b/solutions/observability/apps/fleet-managed-apm-server.md
@@ -428,12 +428,12 @@ Different application servers have different ways of setting the `-javaagent` fl
 java -javaagent:/path/to/elastic-apm-agent-<version>.jar -Delastic.apm.service_name=my-cool-service -Delastic.apm.application_packages=org.example,org.another.example -Delastic.apm.server_url=http://127.0.0.1:8200 -jar my-application.jar
 ```
 
-Refer to [Manual setup with `-javaagent` flag](asciidocalypse://docs/apm-agent-java/docs/reference/setup-javaagent.md) to learn more.
+Refer to [Manual setup with `-javaagent` flag](apm-agent-java://reference/setup-javaagent.md) to learn more.
 
 **Alternate setup methods**
 
-* **Automatic setup with `apm-agent-attach-cli.jar`**<br> Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-cli.md) for more information on this setup method.
-* **Programmatic API setup to self-attach**<br> Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-api.md) for more information on this setup method.
+* **Automatic setup with `apm-agent-attach-cli.jar`**<br> Automatically set up the agent without needing to alter the configuration of your JVM or application server. This method requires no changes to application code or JVM options, and allows attaching to a running JVM. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-cli.md) for more information on this setup method.
+* **Programmatic API setup to self-attach**<br> Set up the agent with a one-line code change and an extra `apm-agent-attach` dependency. This method requires no changes to JVM options, and the agent artifact is embedded within the packaged application binary. Refer to the [Java agent documentation](apm-agent-java://reference/setup-attach-api.md) for more information on this setup method.
 ::::::
 
 ::::::{tab-item} .NET
diff --git a/solutions/observability/apps/metadata.md b/solutions/observability/apps/metadata.md
index a95b0f1929..744e171135 100644
--- a/solutions/observability/apps/metadata.md
+++ b/solutions/observability/apps/metadata.md
@@ -28,7 +28,7 @@ Avoid defining too many user-specified labels. Defining too many unique fields i
 ### Agent API reference [_agent_api_reference]
 
 * Go: [`SetLabel`](apm-agent-go://reference/api-documentation.md#context-set-label)
-* Java: [`setLabel`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-add-tag)
+* Java: [`setLabel`](apm-agent-java://reference/public-api.md#api-transaction-add-tag)
 * .NET: [`SetLabel`](apm-agent-dotnet://reference/public-api.md#api-transaction-set-label)
 * Node.js: [`setLabel`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/agent-api.md#apm-add-labels)
 * PHP: [`Transaction` `setLabel`](asciidocalypse://docs/apm-agent-php/docs/reference/public-api.md#api-transaction-interface-set-label) | [`Span` `setLabel`](asciidocalypse://docs/apm-agent-php/docs/reference/public-api.md#api-span-interface-set-label)
@@ -58,7 +58,7 @@ Setting a circular object, a large object, or a non JSON serializable object can
 
 * Go: [`SetCustom`](apm-agent-go://reference/api-documentation.md#context-set-custom)
 * iOS: *coming soon*
-* Java: [`addCustomContext`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-add-custom-context)
+* Java: [`addCustomContext`](apm-agent-java://reference/public-api.md#api-transaction-add-custom-context)
 * .NET: *coming soon*
 * Node.js: [`setCustomContext`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/agent-api.md#apm-set-custom-context)
 * PHP: *coming soon*
@@ -81,7 +81,7 @@ User context adds **indexed** user information to transactions and errors. Index
 
 * Go: [`SetUsername`](apm-agent-go://reference/api-documentation.md#context-set-user-email)
 * iOS: *coming soon*
-* Java: [`setUser`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-set-user)
+* Java: [`setUser`](apm-agent-java://reference/public-api.md#api-transaction-set-user)
 * .NET *coming soon*
 * Node.js: [`setUserContext`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/agent-api.md#apm-set-user-context)
 * PHP: *coming soon*
diff --git a/solutions/observability/apps/metrics.md b/solutions/observability/apps/metrics.md
index 82c4c149db..8fa440e4a2 100644
--- a/solutions/observability/apps/metrics.md
+++ b/solutions/observability/apps/metrics.md
@@ -13,7 +13,7 @@ mapped_pages:
 
 ## System metrics [_system_metrics]
 
-APM agents automatically pick up basic host-level metrics, including system and process-level CPU and memory metrics. Agent specific metrics are also available, like [JVM metrics](asciidocalypse://docs/apm-agent-java/docs/reference/metrics.md) in the Java Agent, and [Go runtime](apm-agent-go://reference/metrics.md) metrics in the Go Agent.
+APM agents automatically pick up basic host-level metrics, including system and process-level CPU and memory metrics. Agent specific metrics are also available, like [JVM metrics](apm-agent-java://reference/metrics.md) in the Java Agent, and [Go runtime](apm-agent-go://reference/metrics.md) metrics in the Go Agent.
 
 Infrastructure and application metrics are important sources of information when debugging production systems, which is why we’ve made it easy to filter metrics for specific hosts or containers in the {{kib}} [metrics overview](metrics-2.md).
 
@@ -27,7 +27,7 @@ Metrics are stored in metric indices.
 For a full list of tracked metrics, see the relevant agent documentation:
 
 * [Go](apm-agent-go://reference/metrics.md)
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/metrics.md)
+* [Java](apm-agent-java://reference/metrics.md)
 * [Node.js](asciidocalypse://docs/apm-agent-nodejs/docs/reference/metrics.md)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/metrics.md)
 * [Ruby](asciidocalypse://docs/apm-agent-ruby/docs/reference/metrics.md)
diff --git a/solutions/observability/apps/monitoring-aws-lambda-functions.md b/solutions/observability/apps/monitoring-aws-lambda-functions.md
index 63fb04241e..7a08fd72b0 100644
--- a/solutions/observability/apps/monitoring-aws-lambda-functions.md
+++ b/solutions/observability/apps/monitoring-aws-lambda-functions.md
@@ -35,6 +35,6 @@ To get started with the setup of Elastic APM for your Lambda functions, checkout
 
 * [Quick Start with APM on AWS Lambda - Node.js](asciidocalypse://docs/apm-agent-nodejs/docs/reference/lambda.md)
 * [Quick Start with APM on AWS Lambda - Python](asciidocalypse://docs/apm-agent-python/docs/reference/lambda-support.md)
-* [Quick Start with APM on AWS Lambda - Java](asciidocalypse://docs/apm-agent-java/docs/reference/aws-lambda.md)
+* [Quick Start with APM on AWS Lambda - Java](apm-agent-java://reference/aws-lambda.md)
 
 Or, see the [architecture guide](apm-aws-lambda://reference/index.md) to learn more about how the extension works, performance impacts, and more.
\ No newline at end of file
diff --git a/solutions/observability/apps/secret-token.md b/solutions/observability/apps/secret-token.md
index 51ad6de51a..8f01e55542 100644
--- a/solutions/observability/apps/secret-token.md
+++ b/solutions/observability/apps/secret-token.md
@@ -62,7 +62,7 @@ Each Elastic {{apm-agent}} has a configuration option to set the value of the se
 * **Android agent**: [`secretToken`](apm-agent-android://reference/configuration.md)
 * **Go agent**: [`ELASTIC_APM_SECRET_TOKEN`](apm-agent-go://reference/configuration.md#config-secret-token)
 * **iOS agent**: [`secretToken`](apm-agent-ios://reference/configuration.md#secrettoken)
-* **Java agent**: [`secret_token`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-secret-token)
+* **Java agent**: [`secret_token`](apm-agent-java://reference/config-reporter.md#config-secret-token)
 * **.NET agent**: [`ELASTIC_APM_SECRET_TOKEN`](apm-agent-dotnet://reference/config-reporter.md#config-secret-token)
 * **Node.js agent**: [`Secret Token`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#secret-token)
 * **PHP agent**: [`secret_token`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-secret-token)
@@ -72,7 +72,7 @@ Each Elastic {{apm-agent}} has a configuration option to set the value of the se
 In addition to setting the secret token, ensure the configured server URL uses `HTTPS` instead of `HTTP`:
 
 * **Go agent**: [`ELASTIC_APM_SERVER_URL`](apm-agent-go://reference/configuration.md#config-server-url)
-* **Java agent**: [`server_urls`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-server-urls)
+* **Java agent**: [`server_urls`](apm-agent-java://reference/config-reporter.md#config-server-urls)
 * **.NET agent**: [`ServerUrl`](apm-agent-dotnet://reference/config-reporter.md#config-server-url)
 * **Node.js agent**: [`serverUrl`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#server-url)
 * **PHP agent**: [`server_url`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-server-url)
diff --git a/solutions/observability/apps/spans.md b/solutions/observability/apps/spans.md
index 2cc76decaf..7dece2bb25 100644
--- a/solutions/observability/apps/spans.md
+++ b/solutions/observability/apps/spans.md
@@ -35,7 +35,7 @@ To configure the number of spans recorded per transaction, see the relevant Agen
 * Android: *Not yet supported*
 * Go: [`ELASTIC_APM_TRANSACTION_MAX_SPANS`](apm-agent-go://reference/configuration.md#config-transaction-max-spans)
 * iOS: *Not yet supported*
-* Java: [`transaction_max_spans`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-transaction-max-spans)
+* Java: [`transaction_max_spans`](apm-agent-java://reference/config-core.md#config-transaction-max-spans)
 * .NET: [`TransactionMaxSpans`](apm-agent-dotnet://reference/config-core.md#config-transaction-max-spans)
 * Node.js: [`transactionMaxSpans`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#transaction-max-spans)
 * PHP: [`transaction_max_spans`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-transaction-max-spans)
@@ -476,7 +476,7 @@ Support for span compression is available in the following agents and can be con
 | Agent | Same-kind config | Exact-match config |
 | --- | --- | --- |
 | **Go agent** | [`ELASTIC_APM_SPAN_COMPRESSION_SAME_KIND_MAX_DURATION`](apm-agent-go://reference/configuration.md#config-span-compression-exact-match-duration) |
-| **Java agent** | [`span_compression_same_kind_max_duration`](asciidocalypse://docs/apm-agent-java/docs/reference/config-huge-traces.md#config-span-compression-same-kind-max-duration) | [`span_compression_exact_match_max_duration`](asciidocalypse://docs/apm-agent-java/docs/reference/config-huge-traces.md#config-span-compression-exact-match-max-duration) |
+| **Java agent** | [`span_compression_same_kind_max_duration`](apm-agent-java://reference/config-huge-traces.md#config-span-compression-same-kind-max-duration) | [`span_compression_exact_match_max_duration`](apm-agent-java://reference/config-huge-traces.md#config-span-compression-exact-match-max-duration) |
 | **.NET agent** | [`SpanCompressionSameKindMaxDuration`](apm-agent-dotnet://reference/config-core.md#config-span-compression-exact-match-max-duration) |
 | **Node.js agent** | [`spanCompressionSameKindMaxDuration`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#span-compression-exact-match-max-duration) |
 | **Python agent** | [`span_compression_same_kind_max_duration`](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-span-compression-exact-match-max_duration) |
\ No newline at end of file
diff --git a/solutions/observability/apps/ssltls-input-settings.md b/solutions/observability/apps/ssltls-input-settings.md
index 2dce7d25f9..d582ec0431 100644
--- a/solutions/observability/apps/ssltls-input-settings.md
+++ b/solutions/observability/apps/ssltls-input-settings.md
@@ -150,7 +150,7 @@ The list of curve types for ECDHE (Elliptic Curve Diffie-Hellman ephemeral key e
 
 ## List of root certificates for verifying client certificates [_list_of_root_certificates_for_verifying_client_certificates]
 
-The list of root certificates for verifying client certificates. If `certificate_authorities` is empty or not set, the trusted certificate authorities of the host system are used. If `certificate_authorities` is set, `client_authentication` will be automatically set to `required`. Sending client certificates is currently only supported by the RUM agent through the browser, the Java agent (see [Agent certificate authentication](asciidocalypse://docs/apm-agent-java/docs/reference/ssl-configuration.md)), and the Jaeger agent.
+The list of root certificates for verifying client certificates. If `certificate_authorities` is empty or not set, the trusted certificate authorities of the host system are used. If `certificate_authorities` is set, `client_authentication` will be automatically set to `required`. Sending client certificates is currently only supported by the RUM agent through the browser, the Java agent (see [Agent certificate authentication](apm-agent-java://reference/ssl-configuration.md)), and the Jaeger agent.
 
 |     |     |
 | --- | --- |
@@ -160,7 +160,7 @@ The list of root certificates for verifying client certificates. If `certificate
 
 ## Client authentication [_client_authentication]
 
-This configures what types of client authentication are supported. The valid options are `none`, `optional`, and `required`. The default is `none`. If `certificate_authorities` has been specified, this setting will automatically change to `required`. This option only needs to be configured when the agent is expected to provide a client certificate. Sending client certificates is currently only supported by the RUM agent through the browser, the Java agent (see [Agent certificate authentication](asciidocalypse://docs/apm-agent-java/docs/reference/ssl-configuration.md)), and the Jaeger agent.
+This configures what types of client authentication are supported. The valid options are `none`, `optional`, and `required`. The default is `none`. If `certificate_authorities` has been specified, this setting will automatically change to `required`. This option only needs to be configured when the agent is expected to provide a client certificate. Sending client certificates is currently only supported by the RUM agent through the browser, the Java agent (see [Agent certificate authentication](apm-agent-java://reference/ssl-configuration.md)), and the Jaeger agent.
 
 * `none` - Disables client authentication.
 * `optional` - When a client certificate is given, the server will verify it.
diff --git a/solutions/observability/apps/traces.md b/solutions/observability/apps/traces.md
index ae868e8ed2..ad9b970bfd 100644
--- a/solutions/observability/apps/traces.md
+++ b/solutions/observability/apps/traces.md
@@ -152,8 +152,8 @@ span.end()
 ::::::
 
 ::::::{tab-item} Java
-1. Start a transaction with [`startTransaction`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-start-transaction), or a span with [`startSpan`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-span-start-span).
-2. Inject the `traceparent` header into the request object with [`injectTraceHeaders`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-inject-trace-headers)
+1. Start a transaction with [`startTransaction`](apm-agent-java://reference/public-api.md#api-start-transaction), or a span with [`startSpan`](apm-agent-java://reference/public-api.md#api-span-start-span).
+2. Inject the `traceparent` header into the request object with [`injectTraceHeaders`](apm-agent-java://reference/public-api.md#api-transaction-inject-trace-headers)
 3. make network request
 
 Example of manually instrumenting an RPC framework:
@@ -301,8 +301,8 @@ transaction := apm.DefaultTracer().StartTransactionOptions("GET /", "request", o
 ::::::
 
 ::::::{tab-item} Java
-1. Create a transaction as a child of the incoming transaction with [`startTransactionWithRemoteParent()`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-inject-trace-headers).
-2. Start and name the transaction with [`activate()`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-transaction-activate) and [`setName()`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-set-name).
+1. Create a transaction as a child of the incoming transaction with [`startTransactionWithRemoteParent()`](apm-agent-java://reference/public-api.md#api-transaction-inject-trace-headers).
+2. Start and name the transaction with [`activate()`](apm-agent-java://reference/public-api.md#api-transaction-activate) and [`setName()`](apm-agent-java://reference/public-api.md#api-set-name).
 
 Example:
 
diff --git a/solutions/observability/apps/transaction-sampling.md b/solutions/observability/apps/transaction-sampling.md
index e7cae36b35..4f7861a2da 100644
--- a/solutions/observability/apps/transaction-sampling.md
+++ b/solutions/observability/apps/transaction-sampling.md
@@ -183,7 +183,7 @@ The transaction sample rate can be changed dynamically (no redeployment necessar
 Each agent provides a configuration value used to set the transaction sample rate. See the relevant agent’s documentation for more details:
 
 * Go: [`ELASTIC_APM_TRANSACTION_SAMPLE_RATE`](apm-agent-go://reference/configuration.md#config-transaction-sample-rate)
-* Java: [`transaction_sample_rate`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-transaction-sample-rate)
+* Java: [`transaction_sample_rate`](apm-agent-java://reference/config-core.md#config-transaction-sample-rate)
 * .NET: [`TransactionSampleRate`](apm-agent-dotnet://reference/config-core.md#config-transaction-sample-rate)
 * Node.js: [`transactionSampleRate`](asciidocalypse://docs/apm-agent-nodejs/docs/reference/configuration.md#transaction-sample-rate)
 * PHP: [`transaction_sample_rate`](asciidocalypse://docs/apm-agent-php/docs/reference/configuration-reference.md#config-transaction-sample-rate)
diff --git a/solutions/observability/apps/tutorial-monitor-java-application.md b/solutions/observability/apps/tutorial-monitor-java-application.md
index da50446832..7e7ea2f286 100644
--- a/solutions/observability/apps/tutorial-monitor-java-application.md
+++ b/solutions/observability/apps/tutorial-monitor-java-application.md
@@ -15,7 +15,7 @@ You’ll learn how to:
 * Create a sample Java application.
 * Ingest logs using {{filebeat}} and view your logs in {{kib}}.
 * Ingest metrics using the [Metricbeat Prometheus Module](asciidocalypse://docs/beats/docs/reference/metricbeat/metricbeat-module-prometheus.md) and view your metrics in {{kib}}.
-* Instrument your application using the [Elastic APM Java agent](asciidocalypse://docs/apm-agent-java/docs/reference/index.md).
+* Instrument your application using the [Elastic APM Java agent](apm-agent-java://reference/index.md).
 * Monitor your services using {{heartbeat}} and view your uptime data in {{kib}}.
 
 
@@ -1440,7 +1440,7 @@ You could now go ahead and open up the Applications UI and you should see the da
 
 If you do not want to change the startup options of your application, the standalone agent allows you to attach to running JVMs on a host.
 
-This requires you to download the standalone jar. You can find the link on the [official docs](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-cli.md).
+This requires you to download the standalone jar. You can find the link on the [official docs](apm-agent-java://reference/setup-attach-cli.md).
 
 To list your locally running java application, you can run
 
@@ -1497,7 +1497,7 @@ A programmatic setup allows you to attach the agent via a line of java in your s
     }
     ```
 
-    We did not configure any endpoint or API tokens yet. While the [documentation](asciidocalypse://docs/apm-agent-java/docs/reference/setup-attach-api.md#setup-attach-api-configuration) recommends using the `src/main/resources/elasticapm.properties` file, I prefer the use of environment variables, as this prevents either committing API tokens to your source or merging another repository. Mechanisms like [vault](https://www.vaultproject.io/) allow you to manage your secrets in such a way.
+    We did not configure any endpoint or API tokens yet. While the [documentation](apm-agent-java://reference/setup-attach-api.md#setup-attach-api-configuration) recommends using the `src/main/resources/elasticapm.properties` file, I prefer the use of environment variables, as this prevents either committing API tokens to your source or merging another repository. Mechanisms like [vault](https://www.vaultproject.io/) allow you to manage your secrets in such a way.
 
     For our local deployment, I usually use something like [direnv](https://direnv.net/) for local setup. `direnv` is an extension for your local shell that loads/unloads environment variables when you enter a directory, like your application. `direnv` can do quite a bit more like loading the right node/ruby version or adding a directory to your $PATH variable.
 
@@ -1610,7 +1610,7 @@ A programmatic setup allows you to attach the agent via a line of java in your s
 
 Instead of writing code to trace methods, you can also configure the agent to do this. Let’s try to figure out if logging is a bottleneck for our application and trace the request logger statements we added earlier.
 
-The agent can [trace methods](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-trace-methods) based on their signature.
+The agent can [trace methods](apm-agent-java://reference/config-core.md#config-trace-methods) based on their signature.
 
 The interface to monitor would be the `io.javalin.http.RequestLogger` interface with the `handle` method. So let’s try `io.javalin.http.RequestLogger#handle` to identify the method to log and put this in your `.env`.
 
@@ -1661,7 +1661,7 @@ ELASTIC_APM_TRACE_METHODS="de.spinscale.javalin.Log4j2RequestLogger#handle"
 
 ### Automatic profiling of inferred spans [_automatic_profiling_of_inferred_spans]
 
-Once you have a bigger application with more code paths than our sample app, you can try to enable the [automatic profiling of inferred spans](asciidocalypse://docs/apm-agent-java/docs/reference/config-profiling.md#config-profiling-inferred-spans-enabled) by setting the following.
+Once you have a bigger application with more code paths than our sample app, you can try to enable the [automatic profiling of inferred spans](apm-agent-java://reference/config-profiling.md#config-profiling-inferred-spans-enabled) by setting the following.
 
 ```bash
 ELASTIC_APM_PROFILING_INFERRED_SPANS_ENABLED=true
@@ -1691,7 +1691,7 @@ Transaction ids are automatically added to logs. You can check the generated log
 Having the `trace.id` and `transaction.id` added, in the case of an error you will get an `error.id` field.
 
 ::::{important}
-We have not covered the [Elastic APM OpenTracing bridge](asciidocalypse://docs/apm-agent-java/docs/reference/opentracing-bridge.md) or looked into the [additional metrics](asciidocalypse://docs/apm-agent-java/docs/reference/metrics.md) the agent provides, which allows us to take a look at things like garbage collection or the memory footprint of our application.
+We have not covered the [Elastic APM OpenTracing bridge](apm-agent-java://reference/opentracing-bridge.md) or looked into the [additional metrics](apm-agent-java://reference/metrics.md) the agent provides, which allows us to take a look at things like garbage collection or the memory footprint of our application.
 
 ::::
 
diff --git a/solutions/observability/apps/use-opentelemetry-with-apm.md b/solutions/observability/apps/use-opentelemetry-with-apm.md
index 6ce57fade8..671ff46ea0 100644
--- a/solutions/observability/apps/use-opentelemetry-with-apm.md
+++ b/solutions/observability/apps/use-opentelemetry-with-apm.md
@@ -72,7 +72,7 @@ However, not all features of the OpenTelemetry API are supported when using this
 
 Find more details about how to use an OpenTelemetry API or SDK with an Elastic APM agent and which OpenTelemetry API features are supported in the APM agent documentation:
 
-* [**APM Java agent →**](asciidocalypse://docs/apm-agent-java/docs/reference/opentelemetry-bridge.md)
+* [**APM Java agent →**](apm-agent-java://reference/opentelemetry-bridge.md)
 * [**APM .NET agent →**](apm-agent-dotnet://reference/opentelemetry-bridge.md)
 * [**APM Node.js agent →**](asciidocalypse://docs/apm-agent-nodejs/docs/reference/opentelemetry-bridge.md)
 * [**APM Python agent →**](asciidocalypse://docs/apm-agent-python/docs/reference/opentelemetry-api-bridge.md)
diff --git a/solutions/observability/apps/what-happens-when-apm-server-elasticsearch-is-down.md b/solutions/observability/apps/what-happens-when-apm-server-elasticsearch-is-down.md
index 5c6b611ee5..1038d3a1a0 100644
--- a/solutions/observability/apps/what-happens-when-apm-server-elasticsearch-is-down.md
+++ b/solutions/observability/apps/what-happens-when-apm-server-elasticsearch-is-down.md
@@ -14,7 +14,7 @@ APM Server does not have an internal queue to buffer requests, but instead lever
 Some agents have internal queues or buffers that will temporarily store data if the APM Server goes down. As a general rule of thumb, queues fill up quickly. Assume data will be lost if APM Server goes down. Adjusting these queues/buffers can increase the agent’s overhead, so use caution when updating default values.
 
 * **Go agent** - Circular buffer with configurable size: [`ELASTIC_APM_BUFFER_SIZE`](apm-agent-go://reference/configuration.md#config-api-buffer-size).
-* **Java agent** - Internal buffer with configurable size: [`max_queue_size`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-max-queue-size).
+* **Java agent** - Internal buffer with configurable size: [`max_queue_size`](apm-agent-java://reference/config-reporter.md#config-max-queue-size).
 * **Node.js agent** - No internal queue. Data is lost.
 * **PHP agent** - No internal queue. Data is lost.
 * **Python agent** - Internal [Transaction queue](asciidocalypse://docs/apm-agent-python/docs/reference/performance-tuning.md#tuning-queue) with configurable size and time between flushes.
diff --git a/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md b/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
index b4b3a129de..e95d0e623d 100644
--- a/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
+++ b/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md
@@ -728,8 +728,8 @@ Configure the agent using environment variables:
 
 **Learn more in the agent reference**
 
-* [Supported technologies](asciidocalypse://docs/apm-agent-java/docs/reference/supported-technologies.md)
-* [Advanced configuration](asciidocalypse://docs/apm-agent-java/docs/reference/configuration.md)
+* [Supported technologies](apm-agent-java://reference/supported-technologies.md)
+* [Advanced configuration](apm-agent-java://reference/configuration.md)
 ::::::
 
 ::::::{tab-item} .NET
diff --git a/solutions/observability/logs/apm-agent-log-sending.md b/solutions/observability/logs/apm-agent-log-sending.md
index 21c0e80910..81d490c511 100644
--- a/solutions/observability/logs/apm-agent-log-sending.md
+++ b/solutions/observability/logs/apm-agent-log-sending.md
@@ -35,4 +35,4 @@ The Elastic APM agent for Java.
 
 ## Get started [observability-send-application-logs-get-started]
 
-See the [Java agent](asciidocalypse://docs/apm-agent-java/docs/reference/logs.md#log-sending) documentation to get started.
\ No newline at end of file
+See the [Java agent](apm-agent-java://reference/logs.md#log-sending) documentation to get started.
\ No newline at end of file
diff --git a/solutions/observability/logs/ecs-formatted-application-logs.md b/solutions/observability/logs/ecs-formatted-application-logs.md
index 73fecbff56..091f5b0fff 100644
--- a/solutions/observability/logs/ecs-formatted-application-logs.md
+++ b/solutions/observability/logs/ecs-formatted-application-logs.md
@@ -50,7 +50,7 @@ To set up log ECS reformatting:
 
 Log ECS reformatting is controlled by the `log_ecs_reformatting` configuration option, and is disabled by default. Refer to the guide for your framework for information on enabling:
 
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md#config-log-ecs-reformatting)
+* [Java](apm-agent-java://reference/config-logging.md#config-log-ecs-reformatting)
 * [Ruby](asciidocalypse://docs/apm-agent-ruby/docs/reference/configuration.md#config-log-ecs-formatting)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/configuration.md#config-log_ecs_reformatting)
 
diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md
index 0950019cf9..02e9fa8733 100644
--- a/solutions/observability/logs/plaintext-application-logs.md
+++ b/solutions/observability/logs/plaintext-application-logs.md
@@ -342,7 +342,7 @@ Log correlation works on two levels:
 Learn about correlating plaintext logs in the agent-specific ingestion guides:
 
 * [Go](apm-agent-go://reference/logs.md)
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/logs.md#log-correlation-ids)
+* [Java](apm-agent-java://reference/logs.md#log-correlation-ids)
 * [.NET](apm-agent-dotnet://reference/logs.md)
 * [Node.js](asciidocalypse://docs/apm-agent-nodejs/docs/reference/logs.md)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/logs.md#log-correlation-ids)
diff --git a/solutions/observability/logs/stream-application-logs.md b/solutions/observability/logs/stream-application-logs.md
index 54df3213bb..f136a9a34a 100644
--- a/solutions/observability/logs/stream-application-logs.md
+++ b/solutions/observability/logs/stream-application-logs.md
@@ -71,7 +71,7 @@ This feature is supported for the following {{apm-agent}}s:
 
 * [Ruby](asciidocalypse://docs/apm-agent-ruby/docs/reference/configuration.md#config-log-ecs-formatting)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/logs.md#log-reformatting)
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/logs.md#log-reformatting)
+* [Java](apm-agent-java://reference/logs.md#log-reformatting)
 
 **![documentation icon](../../../images/serverless-documentation.svg "") Learn more in [ECS formatted logs](../../../solutions/observability/logs/ecs-formatted-application-logs.md)**
 
@@ -96,7 +96,7 @@ Correlate your application logs with trace events to:
 Learn more about log correlation in the agent-specific ingestion guides:
 
 * [Go](apm-agent-go://reference/logs.md)
-* [Java](asciidocalypse://docs/apm-agent-java/docs/reference/logs.md#log-correlation-ids)
+* [Java](apm-agent-java://reference/logs.md#log-correlation-ids)
 * [.NET](apm-agent-dotnet://reference/logs.md)
 * [Node.js](asciidocalypse://docs/apm-agent-nodejs/docs/reference/logs.md)
 * [Python](asciidocalypse://docs/apm-agent-python/docs/reference/logs.md#log-correlation-ids)
diff --git a/troubleshoot/observability/apm-agent-java/apm-java-agent.md b/troubleshoot/observability/apm-agent-java/apm-java-agent.md
index 111199856b..380b5a05d0 100644
--- a/troubleshoot/observability/apm-agent-java/apm-java-agent.md
+++ b/troubleshoot/observability/apm-agent-java/apm-java-agent.md
@@ -8,7 +8,7 @@ mapped_pages:
 
 Something isn’t quite working as expected? Here are some guidelines how to find out what’s going wrong. 
 
-As a first step, please check if your stack is compatible with the currently [supported technologies](asciidocalypse://docs/apm-agent-java/docs/reference/set-up-apm-java-agent.md#supported-technologies).
+As a first step, please check if your stack is compatible with the currently [supported technologies](apm-agent-java://reference/set-up-apm-java-agent.md#supported-technologies).
 
 Don’t worry if you can’t figure out what the problem is. Open a topic in the [APM discuss forum](https://discuss.elastic.co/c/apm) and we will help you out.
 
@@ -24,7 +24,7 @@ Agent is updated frequently and releases are not strongly tied to other componen
 
 Therefore, trying to update to the most recently released agent version is often the recommended first troubleshooting step. If possible, trying the [latest-snapshot](https://github.com/elastic/apm-agent-java/blob/main/README.md#snapshots) is even preferable as it would include fixes that are not yet released.
 
-See [upgrading documentation](asciidocalypse://docs/apm-agent-java/docs/reference/upgrading.md) for more details.
+See [upgrading documentation](apm-agent-java://reference/upgrading.md) for more details.
 
 
 ## Running alongside other agents [trouble-shooting-additional-agent]
@@ -34,7 +34,7 @@ Like many other Java agents, our agent instruments classes by injecting bytecode
 
 ## Logging [trouble-shooting-logging]
 
-There are several [logging related configuration options](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md). The most important one is [`log_level`](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md#config-log-level).
+There are several [logging related configuration options](apm-agent-java://reference/config-logging.md). The most important one is [`log_level`](apm-agent-java://reference/config-logging.md#config-log-level).
 
 Set the log level to `DEBUG` or even `TRACE` to get more information about the behavior of the agent.
 
@@ -82,7 +82,7 @@ Make sure to execute some requests to your application before posting your log f
 [apm-reporter] DEBUG co.elastic.apm.agent.report.IntakeV2ReportingEventHandler - Receiving TRANSACTION event (sequence 25)
 ```
 
-If you don’t see anything in your logs, the technology stack you are using is probably not [supported](asciidocalypse://docs/apm-agent-java/docs/reference/supported-technologies.md).
+If you don’t see anything in your logs, the technology stack you are using is probably not [supported](apm-agent-java://reference/supported-technologies.md).
 
 After that, you should see logs indicating that the agent has successfully sent data to the APM server:
 
@@ -108,13 +108,13 @@ Ideally this should be done outside of production.
 * It requires restarting the application
 * With log level set to `DEBUG` logs can be verbose, with `TRACE` they are even more verbose.
 * Having only a few transactions in the log makes investigations easier, production traffic creates noise.
-* If not possible, we can still use it for a few minutes in production, when using an external configuration file ([doc](asciidocalypse://docs/apm-agent-java/docs/reference/configuration.md)) the `log_level` can be changed at runtime.
+* If not possible, we can still use it for a few minutes in production, when using an external configuration file ([doc](apm-agent-java://reference/configuration.md)) the `log_level` can be changed at runtime.
 
 Most investigations require using `DEBUG` log level, thus use `DEBUG` unless asked for `TRACE`.
 
 Here, we will refer to the agent log file as `/tmp/agent.log`, but any other location could be used.
 
-1. configure the agent with `log_level=debug` or `log_level=trace` ([doc](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md#config-log-level)) and `log_file=/tmp/agent.log` ([doc](asciidocalypse://docs/apm-agent-java/docs/reference/config-logging.md))
+1. configure the agent with `log_level=debug` or `log_level=trace` ([doc](apm-agent-java://reference/config-logging.md#config-log-level)) and `log_file=/tmp/agent.log` ([doc](apm-agent-java://reference/config-logging.md))
 2. truncate the `/tmp/agent.log` file and restart the application
 3. execute a few transactions which aren’t properly captured by the agent
 4. copy the `/tmp/agent.log` file and send it back for investigation
@@ -176,7 +176,7 @@ The most common source of this problem are connection issues between the agent a
 
 If the APM server does not receive data from the agent, check if the agent is able to establish a connection to the server. In the agent logs, look out for logs containing `Elastic APM server is available` and `Elastic APM server is not available`.
 
-If you see the message `Elastic APM server is not available`, the agent has problems connecting to the APM server. Check the setting of [`server_url`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-server-url) and make sure the agent is able to connect to the server. Try to execute `curl -v <apm-server-url>` from the machine the agent is running on. The server should respond with a 200 status code.
+If you see the message `Elastic APM server is not available`, the agent has problems connecting to the APM server. Check the setting of [`server_url`](apm-agent-java://reference/config-reporter.md#config-server-url) and make sure the agent is able to connect to the server. Try to execute `curl -v <apm-server-url>` from the machine the agent is running on. The server should respond with a 200 status code.
 
 If the APM server does not respond successfully, have a look at the APM server logs to verify that the server is actually running. Also make sure to configure your firewalls so that the host the agent runs on can open HTTP connections to the APM server.
 
@@ -197,15 +197,15 @@ There are two reasons why this might happen:
 
 
     Requests do not reach a servlet
-    :   It’s possible to change the default transaction naming to use the URL path instead. See [`use_path_as_transaction_name` ([1.0.0])](asciidocalypse://docs/apm-agent-java/docs/reference/config-http.md#config-use-path-as-transaction-name) for more information.
+    :   It’s possible to change the default transaction naming to use the URL path instead. See [`use_path_as_transaction_name` ([1.0.0])](apm-agent-java://reference/config-http.md#config-use-path-as-transaction-name) for more information.
 
-        Unfortunately, this may create a lot of duplicate transactions if they have similar paths. For example, in `/usr/{{id}}`, where `{{id}}` is the user ID, you can end up with as many transactions as there are users. You can mitigate this by using [`url_groups` (deprecated)](asciidocalypse://docs/apm-agent-java/docs/reference/config-http.md#config-url-groups), which will allow the use of wildcards in transaction URLs.
+        Unfortunately, this may create a lot of duplicate transactions if they have similar paths. For example, in `/usr/{{id}}`, where `{{id}}` is the user ID, you can end up with as many transactions as there are users. You can mitigate this by using [`url_groups` (deprecated)](apm-agent-java://reference/config-http.md#config-url-groups), which will allow the use of wildcards in transaction URLs.
 
 
 If the proposed fixes do not solve the problem, or if a custom name is required, transaction names can be set manually throughout the request handling flow using our API:
 
-* [`Transaction currentTransaction()`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-current-transaction) gets the current transaction.
-* [`Transaction setName(String name)`](asciidocalypse://docs/apm-agent-java/docs/reference/public-api.md#api-set-name) sets the transaction name.
+* [`Transaction currentTransaction()`](apm-agent-java://reference/public-api.md#api-current-transaction) gets the current transaction.
+* [`Transaction setName(String name)`](apm-agent-java://reference/public-api.md#api-set-name) sets the transaction name.
 
 
 ### Libraries compiled against old Java versions [trouble-shooting-old-jdbc-drivers]
@@ -224,14 +224,14 @@ That mostly concerns JDBC drivers. Updating them to a more recent version should
 
 If you are using a manual setup with a `-javaagent` flag against an application server and are seeing the `Failed to find Premain-Class manifest attribute` error and a failure to start, then you might be pointing at the incorrect jar file.
 
-The correct jar file to be pointing at should be in the form of `elastic-apm-agent-<version>.jar` and further information about how to download this file can be found [in the manual setup instructions.](asciidocalypse://docs/apm-agent-java/docs/reference/setup-javaagent.md)
+The correct jar file to be pointing at should be in the form of `elastic-apm-agent-<version>.jar` and further information about how to download this file can be found [in the manual setup instructions.](apm-agent-java://reference/setup-javaagent.md)
 
 
 ### Communication with APM Server [trouble-shooting-communication]
 
-`unable to find valid certification path to requested target` - server authentication fails. Check out [APM Server certificate authentication](asciidocalypse://docs/apm-agent-java/docs/reference/ssl-configuration.md#ssl-server-authentication).
+`unable to find valid certification path to requested target` - server authentication fails. Check out [APM Server certificate authentication](apm-agent-java://reference/ssl-configuration.md#ssl-server-authentication).
 
-`java.net.SocketException: Broken pipe` - one option is that client authentication fails. Check out [Agent certificate authentication](asciidocalypse://docs/apm-agent-java/docs/reference/ssl-configuration.md#ssl-client-authentication).
+`java.net.SocketException: Broken pipe` - one option is that client authentication fails. Check out [Agent certificate authentication](apm-agent-java://reference/ssl-configuration.md#ssl-client-authentication).
 
 With Oracle Weblogic application server wildcard TLS certificates are not allowed by default, when this happens a message error like this is visible in agent logs: `Hostname verification failed: HostnameVerifier=weblogic.security.utils.SSLWLSHostnameVerifier`. Disabling this extra check can be done with `-Dweblogic.security.SSL.ignoreHostnameVerification=true`.
 
@@ -254,7 +254,7 @@ Known issues:
     1. Add `-XX:CompileCommand=exclude,java.lang.invoke.LambdaForm*::*` to the command line to avoid the problematic JIT compilation
     2. Increase the delay from the default (3000ms) by setting the `elastic.apm.delay_agent_premain_ms` System property to indicate the number of milliseconds to delay, through the command line, for example: `-Delastic.apm.delay_agent_premain_ms=10000`.
 
-* When [`profiling_inferred_spans_enabled` ([1.15.0] experimental)](asciidocalypse://docs/apm-agent-java/docs/reference/config-profiling.md#config-profiling-inferred-spans-enabled) is set to `true`, it uses a native library that collects low-level information from the JVM. All known issues so far had been fixed. Try to disable it if you think the crash may be related. We continuously upgrade to the latest async profiler version, so upgrading your agent to the latest version may already contain a fix.
+* When [`profiling_inferred_spans_enabled` ([1.15.0] experimental)](apm-agent-java://reference/config-profiling.md#config-profiling-inferred-spans-enabled) is set to `true`, it uses a native library that collects low-level information from the JVM. All known issues so far had been fixed. Try to disable it if you think the crash may be related. We continuously upgrade to the latest async profiler version, so upgrading your agent to the latest version may already contain a fix.
 
 Whenever you encounter a JVM crash, please report through [our forum](https://discuss.elastic.co/c/observability/apm/58) or by opening an issue on our [GitHub repository](https://github.com/elastic/apm-agent-java). Look for the crash log (e.g. an `hs_err_pid<PID>.log`) and provide it when reporting, as well as all factors describing you setup and scenario.
 
@@ -273,9 +273,9 @@ If you use `jlink` to create a custom runtime, make sure the following modules a
 
 In the unlikely event the agent causes disruptions to a production application, you can disable the agent while you troubleshoot.
 
-Using [dynamic configuration](asciidocalypse://docs/apm-agent-java/docs/reference/configuration.md#configuration-dynamic), you can disable the recording of events by setting [`recording`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-recording) to `false`.
+Using [dynamic configuration](apm-agent-java://reference/configuration.md#configuration-dynamic), you can disable the recording of events by setting [`recording`](apm-agent-java://reference/config-core.md#config-recording) to `false`.
 
-If that doesn’t work, you can completely disable the agent by setting [`enabled`](asciidocalypse://docs/apm-agent-java/docs/reference/config-core.md#config-enabled) to `false`. You’ll need to restart your application for this change to take effect.
+If that doesn’t work, you can completely disable the agent by setting [`enabled`](apm-agent-java://reference/config-core.md#config-enabled) to `false`. You’ll need to restart your application for this change to take effect.
 
 
 ## Unsupported framework versions [trouble-shooting-unsupported-framework-versions]
diff --git a/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md b/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
index 6911ba63cc..e97b4ecc8b 100644
--- a/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
+++ b/troubleshoot/observability/apm/what-happens-when-apm-server-elasticsearch-is-down.md
@@ -14,7 +14,7 @@ APM Server does not have an internal queue to buffer requests, but instead lever
 Some agents have internal queues or buffers that will temporarily store data if the APM Server goes down. As a general rule of thumb, queues fill up quickly. Assume data will be lost if APM Server goes down. Adjusting these queues/buffers can increase the agent’s overhead, so use caution when updating default values.
 
 * **Go agent** - Circular buffer with configurable size: [`ELASTIC_APM_BUFFER_SIZE`](apm-agent-go://reference/configuration.md#config-api-buffer-size).
-* **Java agent** - Internal buffer with configurable size: [`max_queue_size`](asciidocalypse://docs/apm-agent-java/docs/reference/config-reporter.md#config-max-queue-size).
+* **Java agent** - Internal buffer with configurable size: [`max_queue_size`](apm-agent-java://reference/config-reporter.md#config-max-queue-size).
 * **Node.js agent** - No internal queue. Data is lost.
 * **PHP agent** - No internal queue. Data is lost.
 * **Python agent** - Internal [Transaction queue](asciidocalypse://docs/apm-agent-python/docs/reference/performance-tuning.md#tuning-queue) with configurable size and time between flushes.