diff --git a/demos/end-to-end-security/create-spark-report.yaml b/demos/end-to-end-security/create-spark-report.yaml
index 6e394403..79b32e9b 100644
--- a/demos/end-to-end-security/create-spark-report.yaml
+++ b/demos/end-to-end-security/create-spark-report.yaml
@@ -70,7 +70,7 @@ data:
         spark.kerberos.principal: spark/spark.default.svc.cluster.local@KNAB.COM
         spark.sql.catalog.lakehouse: org.apache.iceberg.spark.SparkCatalog
         spark.sql.catalog.lakehouse.type: hive
-        spark.sql.catalog.lakehouse.uri: thrift://hive-iceberg:9083
+        spark.sql.catalog.lakehouse.uri: thrift://hive-iceberg-metastore:9083
         spark.sql.defaultCatalog: lakehouse
         spark.sql.extensions: org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
       job:
diff --git a/stacks/end-to-end-security/superset.yaml b/stacks/end-to-end-security/superset.yaml
index b5f0c431..7c4bb637 100644
--- a/stacks/end-to-end-security/superset.yaml
+++ b/stacks/end-to-end-security/superset.yaml
@@ -15,7 +15,7 @@ spec:
           clientCredentialsSecret: superset-keycloak-client
         userRegistrationRole: Gamma_extended
   nodes:
-    config:
+    roleConfig:
       listenerClass: external-unstable
     roleGroups:
       default:
diff --git a/stacks/end-to-end-security/trino.yaml b/stacks/end-to-end-security/trino.yaml
index 6a2485c1..36d4a266 100644
--- a/stacks/end-to-end-security/trino.yaml
+++ b/stacks/end-to-end-security/trino.yaml
@@ -7,7 +7,6 @@ spec:
   image:
     productVersion: "476"
   clusterConfig:
-    listenerClass: external-unstable
     tls:
       serverSecretClass: tls
     catalogLabelSelector:
@@ -23,6 +22,8 @@ spec:
         configMapName: opa
         package: trino
   coordinators:
+    roleConfig:
+      listenerClass: external-unstable
     podOverrides: &podOverrides
       spec:
         containers: