diff --git a/modules/concepts/pages/opa.adoc b/modules/concepts/pages/opa.adoc
index 546766c3b..66cb78721 100644
--- a/modules/concepts/pages/opa.adoc
+++ b/modules/concepts/pages/opa.adoc
@@ -83,6 +83,6 @@ Read more about the xref:opa:index.adoc[]. Read more about product integration w
 
 * xref:trino:usage_guide/security.adoc#_authorization[Trino]
 * xref:kafka:usage.adoc[Kafka]
-* xref:druid:usage.adoc#_using_open_policy_agent_opa_for_authorization[Druid]
+* xref:druid:usage-guide/security.adoc#authorization[Druid]
 
 You can also have a look at the xref:contributor:opa_configuration.adoc[implementation guidelines for OPA authorizers] or learn more about the xref:service_discovery.adoc[service discovery mechanism] used across the platform.
diff --git a/modules/concepts/pages/s3.adoc b/modules/concepts/pages/s3.adoc
index a6cfb3b9c..c95d6ecf0 100644
--- a/modules/concepts/pages/s3.adoc
+++ b/modules/concepts/pages/s3.adoc
@@ -3,7 +3,7 @@
 // -------------- Intro ----------------
 
 Many of the tools on the Stackable platform integrate with S3 storage in some way.
-For example Druid can xref:druid:usage.adoc#_s3_for_ingestion[ingest data from S3] and also xref:druid:usage.adoc##_s3_deep_storage[use S3 as a backend for deep storage], Spark can use an xref:spark-k8s:usage.adoc#_s3_bucket_specification[S3 bucket] to store application files and data.
+For example Druid can xref:druid:usage-guide/ingestion.adoc#s3[ingest data from S3] and also xref:druid:usage-guide/deep-storage.adoc#s3[use S3 as a backend for deep storage], Spark can use an xref:spark-k8s:usage.adoc#_s3_bucket_specification[S3 bucket] to store application files and data.
 
 == S3Connection and S3Bucket
 // introducing the objects