diff --git a/docs/modules/opa/pages/index.adoc b/docs/modules/opa/pages/index.adoc
index 8fd7381e..5786fd35 100644
--- a/docs/modules/opa/pages/index.adoc
+++ b/docs/modules/opa/pages/index.adoc
@@ -3,8 +3,8 @@
 :keywords: Stackable operator, OPA, OpenPolicyAgent, Rego, Kubernetes, k8s, operator, policy, authorization, ACL
 :opa: https://www.openpolicyagent.org/
 :github: https://github.com/stackabletech/opa-operator/
-:crd: {crd-docs-base-url}/opa-operator/{crd-docs-version}/
-:crd-opacluster: {crd-docs}/opa.stackable.tech/opacluster/v1alpha2/
+:crd: {crd-ref}{crd-ref-release}&operator=opa-operator
+:crd-opacluster: {crd-ref}/opa.stackable.tech/v1alpha2/opacluster{crd-ref-release}
 :feature-tracker: https://features.stackable.tech/unified
 :rego: https://www.openpolicyagent.org/docs/latest/policy-language/
 
diff --git a/docs/modules/opa/pages/reference/crds.adoc b/docs/modules/opa/pages/reference/crds.adoc
index b49729ad..fb66a83f 100644
--- a/docs/modules/opa/pages/reference/crds.adoc
+++ b/docs/modules/opa/pages/reference/crds.adoc
@@ -1,3 +1,3 @@
 = CRD reference
 
-Find all CRD reference for the Stackable operator for OpenPolicyAgent at: {crd-docs-base-url}/opa-operator/{crd-docs-version}.
+Find all CRD reference for the Stackable operator for OpenPolicyAgent at: {crd-ref}{crd-ref-release}&operator=opa-operator.
diff --git a/docs/modules/opa/partials/nav.adoc b/docs/modules/opa/partials/nav.adoc
index 58dfa4df..ad449390 100644
--- a/docs/modules/opa/partials/nav.adoc
+++ b/docs/modules/opa/partials/nav.adoc
@@ -19,7 +19,7 @@
 *** xref:opa:usage-guide/operations/graceful-shutdown.adoc[]
 * xref:opa:reference/index.adoc[]
 ** xref:opa:reference/crds.adoc[]
-*** {crd-docs}/opa.stackable.tech/opacluster/v1alpha2/[OpaCluster {external-link-icon}^]
+*** {crd-ref}/opa.stackable.tech/v1alpha2/opacluster{crd-ref-release}[OpaCluster {external-link-icon}^]
 ** xref:opa:reference/discovery.adoc[]
 ** xref:opa:reference/commandline-parameters.adoc[]
 ** xref:opa:reference/environment-variables.adoc[]