diff --git a/docs/modules/airflow/pages/index.adoc b/docs/modules/airflow/pages/index.adoc
index 43603b88..0f88fafa 100644
--- a/docs/modules/airflow/pages/index.adoc
+++ b/docs/modules/airflow/pages/index.adoc
@@ -4,8 +4,8 @@
 :airflow: https://airflow.apache.org/
 :dags: https://airflow.apache.org/docs/apache-airflow/stable/core-concepts/dags.html
 :github: https://github.com/stackabletech/airflow-operator/
-:crd: {crd-docs-base-url}/airflow-operator/{crd-docs-version}/
-:crd-airflowcluster: {crd-docs}/airflow.stackable.tech/airflowcluster/v1alpha2/
+:crd: {crd-ref}{crd-ref-release}&operator=airflow-operator
+:crd-airflowcluster: {crd-ref}/airflow.stackable.tech/v1alpha2/airflowcluster{crd-ref-release}
 :hub: {hub-base-url}/components/airflow
 :deferrable-operators: https://airflow.apache.org/docs/apache-airflow/stable/authoring-and-scheduling/deferring.html#deferrable-operators-triggers
 
diff --git a/docs/modules/airflow/pages/reference/crds.adoc b/docs/modules/airflow/pages/reference/crds.adoc
index 843f3c3b..2c6ae5e3 100644
--- a/docs/modules/airflow/pages/reference/crds.adoc
+++ b/docs/modules/airflow/pages/reference/crds.adoc
@@ -1,3 +1,3 @@
 = CRD Reference
 
-Find all CRD reference for the Stackable Operator for Apache Airfow at: {crd-docs-base-url}/airflow-operator/{crd-docs-version}.
+Find all CRD reference for the Stackable Operator for Apache Airfow at: {crd-ref}{crd-ref-release}&operator=airflow-operator.
diff --git a/docs/modules/airflow/pages/usage-guide/security.adoc b/docs/modules/airflow/pages/usage-guide/security.adoc
index 9f4597ab..060037ec 100644
--- a/docs/modules/airflow/pages/usage-guide/security.adoc
+++ b/docs/modules/airflow/pages/usage-guide/security.adoc
@@ -55,7 +55,7 @@ Users that log in with LDAP are assigned to a default {airflow-access-control-do
 
 TLS verification for the authentication connection cannot be disabled; the operator rejects an AuthenticationClass that turns it off.
 
-You can follow the xref:tutorials:authentication_with_openldap.adoc[] tutorial to learn how to set up an AuthenticationClass for an LDAP server, as well as consulting the {crd-docs}/authentication.stackable.tech/authenticationclass/v1alpha1/[AuthenticationClass reference {external-link-icon}^].
+You can follow the xref:tutorials:authentication_with_openldap.adoc[] tutorial to learn how to set up an AuthenticationClass for an LDAP server, as well as consulting the {crd-ref}/authentication.stackable.tech/v1alpha1/authenticationclass{crd-ref-release}[AuthenticationClass reference {external-link-icon}^].
 
 The users and roles can be viewed as before in the Webserver UI, but the blue "+" button is not available when authenticating via LDAP:
 
diff --git a/docs/modules/airflow/partials/nav.adoc b/docs/modules/airflow/partials/nav.adoc
index cf425e30..dc7713b0 100644
--- a/docs/modules/airflow/partials/nav.adoc
+++ b/docs/modules/airflow/partials/nav.adoc
@@ -23,6 +23,6 @@
 * xref:airflow:troubleshooting/index.adoc[]
 * xref:airflow:reference/index.adoc[]
 ** xref:airflow:reference/crds.adoc[]
-*** {crd-docs}/airflow.stackable.tech/airflowcluster/v1alpha2/[AirflowCluster {external-link-icon}^]
+*** {crd-ref}/airflow.stackable.tech/v1alpha2/airflowcluster{crd-ref-release}[AirflowCluster {external-link-icon}^]
 ** xref:airflow:reference/commandline-parameters.adoc[]
 ** xref:airflow:reference/environment-variables.adoc[]