diff --git a/modules/operators/pages/supported_versions.adoc b/modules/operators/pages/supported_versions.adoc
index ee63e6877..ff14f1b12 100644
--- a/modules/operators/pages/supported_versions.adoc
+++ b/modules/operators/pages/supported_versions.adoc
@@ -4,48 +4,48 @@ The latest versions of each of the Stackable Operators support the following pro
 
 == Apache Airflow
 
-include::airflow::partial$supported-versions.adoc[]
+include::airflow:partial$supported-versions.adoc[]
 
 == Apache Druid
 
-include::druid::partial$supported-versions.adoc[]
+include::druid:partial$supported-versions.adoc[]
 
 == Apache HBase
 
-include::hbase::partial$supported-versions.adoc[]
+include::hbase:partial$supported-versions.adoc[]
 
 == Apache HDFS
 
-include::hdfs::partial$supported-versions.adoc[]
+include::hdfs:partial$supported-versions.adoc[]
 
 == Apache Hive
 
-include::hive::partial$supported-versions.adoc[]
+include::hive:partial$supported-versions.adoc[]
 
 == Apache Kafka
 
-include::kafka::partial$supported-versions.adoc[]
+include::kafka:partial$supported-versions.adoc[]
 
 == Apache NiFi
 
-include::nifi::partial$supported-versions.adoc[]
+include::nifi:partial$supported-versions.adoc[]
 
 == Open Policy Agent (OPA)
 
-include::opa::partial$supported-versions.adoc[]
+include::opa:partial$supported-versions.adoc[]
 
 == Apache Spark on Kubernetes
 
-include::spark-k8s::partial$supported-versions.adoc[]
+include::spark-k8s:partial$supported-versions.adoc[]
 
 == Apache Superset
 
-include::superset::partial$supported-versions.adoc[]
+include::superset:partial$supported-versions.adoc[]
 
 == Apache ZooKeeper
 
-include::zookeeper::partial$supported-versions.adoc[]
+include::zookeeper:partial$supported-versions.adoc[]
 
 == Trino
 
-include::trino::partial$supported-versions.adoc[]
+include::trino:partial$supported-versions.adoc[]
diff --git a/modules/operators/partials/operator_doc_links.adoc b/modules/operators/partials/operator_doc_links.adoc
index 92ef0a2b0..f835b8487 100644
--- a/modules/operators/partials/operator_doc_links.adoc
+++ b/modules/operators/partials/operator_doc_links.adoc
@@ -1,20 +1,76 @@
 // docs for the syntax below: https://docs.antora.org/antora/latest/navigation/include-lists/#include-a-nested-list
-** xref:airflow::index.adoc[Apache Airflow]
-** xref:druid::index.adoc[Apache Druid]
-** xref:hbase::index.adoc[Apache HBase]
-** xref:hdfs::index.adoc[Apache Hadoop HDFS]
-** xref:hive::index.adoc[Apache Hive]
-** xref:kafka::index.adoc[Apache Kafka]
-** xref:nifi::index.adoc[Apache NiFi]
-** xref:spark-k8s::index.adoc[Apache Spark on K8S]
-** xref:superset::index.adoc[Apache Superset]
-** xref:trino::index.adoc[Trino]
-** xref:zookeeper::index.adoc[Apache ZooKeeper]
-** xref:opa:index.adoc[Open Policy Agent]
+** xref:airflow:index.adoc[Apache Airflow]
++
+--
+include::airflow:partial$nav.adoc[]
+--
+** xref:druid:index.adoc[Apache Druid]
++
+--
+include::druid:partial$nav.adoc[]
+--
+** xref:hbase:index.adoc[Apache HBase]
++
+--
+include::hbase:partial$nav.adoc[]
+--
+** xref:hdfs:index.adoc[Apache Hadoop HDFS]
++
+--
+include::hdfs:partial$nav.adoc[]
+--
+** xref:hive:index.adoc[Apache Hive]
++
+--
+include::hive:partial$nav.adoc[]
+--
+** xref:kafka:index.adoc[Apache Kafka]
++
+--
+include::kafka:partial$nav.adoc[]
+--
+** xref:nifi:index.adoc[Apache NiFi]
++
+--
+include::nifi:partial$nav.adoc[]
+--
+** xref:spark-k8s:index.adoc[Apache Spark on K8S]
++
+--
+include::spark-k8s:partial$nav.adoc[]
+--
+** xref:superset:index.adoc[Apache Superset]
++
+--
+include::superset:partial$nav.adoc[]
+--
+** xref:trino:index.adoc[Trino]
++
+--
+include::trino:partial$nav.adoc[]
+--
+** xref:zookeeper:index.adoc[Apache ZooKeeper]
++
+--
+include::zookeeper:partial$nav.adoc[]
+--
+** xref:opa:index.adoc[OpenPolicyAgent]
 +
 --
 include::opa:partial$nav.adoc[]
 --
-** xref:commons-operator::index.adoc[Commons]
-** xref:listener-operator::index.adoc[Listener]
-** xref:secret-operator::index.adoc[Secret]
+** xref:commons-operator:index.adoc[Commons]
++
+--
+include::commons-operator:partial$nav.adoc[]
+--
+** xref:listener-operator:index.adoc[Listener]
++
+--
+include::listener-operator:partial$nav.adoc[]
+--
+** xref:secret-operator:index.adoc[Secret]
++
+--
+include::secret-operator:partial$nav.adoc[]
+--
diff --git a/netlify.toml b/netlify.toml
index cd9ea1127..537977eef 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,10 +1,168 @@
+[[redirects]]
+  from = "/airflow/nightly/*"
+  to = "/home/nightly/airflow/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/druid/nightly/*"
+  to = "/home/nightly/druid/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/hbase/nightly/*"
+  to = "/home/nightly/hbase/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/hdfs/nightly/*"
+  to = "/home/nightly/hdfs/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/hive/nightly/*"
+  to = "/home/nightly/hive/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/kafka/nightly/*"
+  to = "/home/nightly/kafka/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/nifi/nightly/*"
+  to = "/home/nightly/nifi/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/spark-k8s/nightly/*"
+  to = "/home/nightly/spark-k8s/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/superset/nightly/*"
+  to = "/home/nightly/superset/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/trino/nightly/*"
+  to = "/home/nightly/trino/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/zookeeper/nightly/*"
+  to = "/home/nightly/zookeeper/:splat"
+  status = 302
+
 [[redirects]]
   from = "/opa/nightly/*"
   to = "/home/nightly/opa/:splat"
   status = 302
 
+[[redirects]]
+  from = "/commons-operator/nightly/*"
+  to = "/home/nightly/commons-operator/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/secret-operator/nightly/*"
+  to = "/home/nightly/secret-operator/:splat"
+  status = 302
+
+[[redirects]]
+  from = "/listener-operator/nightly/*"
+  to = "/home/nightly/listener-operator/:splat"
+  status = 302
+
+# stable redirects
+# force = true --> We're generating a compat page, but redirect it
+
+[[redirects]]
+  from = "/airflow/stable/*"
+  to = "/home/stable/airflow/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/druid/stable/*"
+  to = "/home/stable/druid/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/hbase/stable/*"
+  to = "/home/stable/hbase/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/hdfs/stable/*"
+  to = "/home/stable/hdfs/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/hive/stable/*"
+  to = "/home/stable/hive/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/kafka/stable/*"
+  to = "/home/stable/kafka/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nifi/stable/*"
+  to = "/home/stable/nifi/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/spark-k8s/stable/*"
+  to = "/home/stable/spark-k8s/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/superset/stable/*"
+  to = "/home/stable/superset/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/trino/stable/*"
+  to = "/home/stable/trino/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/zookeeper/stable/*"
+  to = "/home/stable/zookeeper/:splat"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/opa/stable/*"
   to = "/home/stable/opa/:splat"
   status = 302
-  force = true  # We're generating a compat page, but redirect it
+  force = true
+
+[[redirects]]
+  from = "/commons-operator/stable/*"
+  to = "/home/stable/commons-operator/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/secret-operator/stable/*"
+  to = "/home/stable/secret-operator/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/listener-operator/stable/*"
+  to = "/home/stable/listener-operator/:splat"
+  status = 302
+  force = true
+