diff --git a/docs/modules/trino/examples/getting_started/code/trino.yaml b/docs/modules/trino/examples/getting_started/code/trino.yaml
index 1a945dad..6a84b870 100644
--- a/docs/modules/trino/examples/getting_started/code/trino.yaml
+++ b/docs/modules/trino/examples/getting_started/code/trino.yaml
@@ -8,6 +8,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     catalogLabelSelector:
       matchLabels:
         trino: simple-trino
diff --git a/docs/modules/trino/examples/usage_guide/trino-insecure.yaml b/docs/modules/trino/examples/usage_guide/trino-insecure.yaml
index 206a84aa..bafd5c7e 100644
--- a/docs/modules/trino/examples/usage_guide/trino-insecure.yaml
+++ b/docs/modules/trino/examples/usage_guide/trino-insecure.yaml
@@ -20,6 +20,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     catalogLabelSelector:
       matchLabels:
         trino: simple-trino
diff --git a/docs/modules/trino/examples/usage_guide/trino-secure-internal-tls.yaml b/docs/modules/trino/examples/usage_guide/trino-secure-internal-tls.yaml
index bcf97c5e..bb2b4874 100644
--- a/docs/modules/trino/examples/usage_guide/trino-secure-internal-tls.yaml
+++ b/docs/modules/trino/examples/usage_guide/trino-secure-internal-tls.yaml
@@ -20,6 +20,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     tls:
       internalSecretClass: trino-internal-tls # <1>
     authentication:
diff --git a/docs/modules/trino/examples/usage_guide/trino-secure-tls-only.yaml b/docs/modules/trino/examples/usage_guide/trino-secure-tls-only.yaml
index ef6207b1..896a96f4 100644
--- a/docs/modules/trino/examples/usage_guide/trino-secure-tls-only.yaml
+++ b/docs/modules/trino/examples/usage_guide/trino-secure-tls-only.yaml
@@ -20,6 +20,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     tls:
       serverSecretClass: trino-tls # <1>
     catalogLabelSelector:
diff --git a/docs/modules/trino/examples/usage_guide/trino-secure-tls.yaml b/docs/modules/trino/examples/usage_guide/trino-secure-tls.yaml
index 3cc603f9..2931d5c9 100644
--- a/docs/modules/trino/examples/usage_guide/trino-secure-tls.yaml
+++ b/docs/modules/trino/examples/usage_guide/trino-secure-tls.yaml
@@ -20,6 +20,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     tls:
       serverSecretClass: trino-tls # <1>
     authentication:
diff --git a/docs/modules/trino/pages/usage_guide/catalogs/index.adoc b/docs/modules/trino/pages/usage_guide/catalogs/index.adoc
index ecab7466..4112f213 100644
--- a/docs/modules/trino/pages/usage_guide/catalogs/index.adoc
+++ b/docs/modules/trino/pages/usage_guide/catalogs/index.adoc
@@ -72,9 +72,10 @@ spec:
   image:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
-  catalogLabelSelector:
-    matchLabels:
-      trino: simple-trino
+  clusterConfig:
+    catalogLabelSelector:
+      matchLabels:
+        trino: simple-trino
 # ...
 ----
 
diff --git a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
index 371b9758..88859df9 100644
--- a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
+++ b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
@@ -8,6 +8,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     authentication:
       method:
         multiUser:
diff --git a/examples/simple-trino-cluster-hive-ha-s3.yaml b/examples/simple-trino-cluster-hive-ha-s3.yaml
index 05ed2408..cee06b1e 100644
--- a/examples/simple-trino-cluster-hive-ha-s3.yaml
+++ b/examples/simple-trino-cluster-hive-ha-s3.yaml
@@ -12,6 +12,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     catalogLabelSelector:
       matchLabels:
         trino: simple-trino
diff --git a/examples/simple-trino-cluster-s3.yaml b/examples/simple-trino-cluster-s3.yaml
index d77aa914..644c2c8d 100644
--- a/examples/simple-trino-cluster-s3.yaml
+++ b/examples/simple-trino-cluster-s3.yaml
@@ -10,6 +10,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     catalogLabelSelector:
       matchLabels:
         trino: simple-trino
diff --git a/examples/simple-trino-cluster.yaml b/examples/simple-trino-cluster.yaml
index 4e853533..30b0db9a 100644
--- a/examples/simple-trino-cluster.yaml
+++ b/examples/simple-trino-cluster.yaml
@@ -8,6 +8,7 @@ spec:
     productVersion: "396"
     stackableVersion: "23.4.0-rc2"
   clusterConfig:
+    listenerClass: external-unstable
     catalogLabelSelector:
       matchLabels:
         trino: simple-trino