diff --git a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
index 3275c927..187f94ee 100644
--- a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
+++ b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
@@ -39,7 +39,7 @@ data:
     import logging
     import requests
 
-    base_url = "http://superset-external:8088" # For local testing / developing replace it, afterwards change back to http://superset-external:8088
+    base_url = "http://superset-node-default:8088" # For local testing / developing replace it, afterwards change back to http://superset-node-default:8088
     superset_username = open("/superset-credentials/adminUser.username").read()
     superset_password =  open("/superset-credentials/adminUser.password").read()
     trino_username = "admin"
diff --git a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml
index 9be84027..2089a4f2 100644
--- a/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml
+++ b/demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml
@@ -55,7 +55,7 @@ data:
     import logging
     import requests
 
-    base_url = "http://superset-external:8088" # For local testing / developing replace it, afterwards change back to http://superset-external:8088
+    base_url = "http://superset-node-default:8088" # For local testing / developing replace it, afterwards change back to http://superset-node-default:8088
     superset_username = open("/superset-credentials/adminUser.username").read()
     superset_password =  open("/superset-credentials/adminUser.password").read()
 
diff --git a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml
index 0d85b0b0..6e8750ef 100644
--- a/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml
+++ b/demos/nifi-kafka-druid-water-level-data/setup-superset.yaml
@@ -55,7 +55,7 @@ data:
     import logging
     import requests
 
-    base_url = "http://superset-external:8088" # For local testing / developing replace it, afterwards change back to http://superset-external:8088
+    base_url = "http://superset-node-default:8088" # For local testing / developing replace it, afterwards change back to http://superset-node-default:8088
     superset_username = open("/superset-credentials/adminUser.username").read()
     superset_password =  open("/superset-credentials/adminUser.password").read()
 
diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml
index 56f8d5a3..58596353 100644
--- a/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml
+++ b/demos/spark-k8s-anomaly-detection-taxi-data/setup-superset.yaml
@@ -39,7 +39,7 @@ data:
     import logging
     import requests
 
-    base_url = "http://superset-external:8088" # For local testing / developing replace it, afterwards change back to http://superset-external:8088
+    base_url = "http://superset-node-default:8088" # For local testing / developing replace it, afterwards change back to http://superset-node-default:8088
     superset_username = open("/superset-credentials/adminUser.username").read()
     superset_password =  open("/superset-credentials/adminUser.password").read()
     trino_username = "admin"
diff --git a/demos/trino-taxi-data/setup-superset.yaml b/demos/trino-taxi-data/setup-superset.yaml
index cb613aec..1174c2a4 100644
--- a/demos/trino-taxi-data/setup-superset.yaml
+++ b/demos/trino-taxi-data/setup-superset.yaml
@@ -39,7 +39,7 @@ data:
     import logging
     import requests
 
-    base_url = "http://superset-external:8088" # For local testing / developing replace it, afterwards change back to http://superset-external:8088
+    base_url = "http://superset-node-default:8088" # For local testing / developing replace it, afterwards change back to http://superset-node-default:8088
     superset_username = open("/superset-credentials/adminUser.username").read()
     superset_password =  open("/superset-credentials/adminUser.password").read()
     trino_username = "admin"
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
index 65c603eb..bcf7c690 100644
--- a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
+++ b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
@@ -1,12 +1,4 @@
 ---
-apiVersion: zookeeper.stackable.tech/v1alpha1
-kind: ZookeeperZnode
-metadata:
-  name: kafka-znode
-spec:
-  clusterRef:
-    name: zookeeper
----
 apiVersion: kafka.stackable.tech/v1alpha1
 kind: KafkaCluster
 metadata:
@@ -46,3 +38,11 @@ spec:
   provider:
     tls:
       clientCertSecretClass: tls
+---
+apiVersion: zookeeper.stackable.tech/v1alpha1
+kind: ZookeeperZnode
+metadata:
+  name: kafka-znode
+spec:
+  clusterRef:
+    name: zookeeper
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
index bdf4f721..58a4c2db 100644
--- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
+++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
@@ -13,7 +13,6 @@ spec:
     sensitiveProperties:
       keySecret: nifi-sensitive-property-key
       autoGenerate: true
-    zookeeperConfigMapName: nifi-znode
   nodes:
     config:
       resources:
@@ -53,11 +52,3 @@ metadata:
   name: nifi-admin-credentials-secret
 stringData:
   admin: {{ nifiAdminPassword }}
----
-apiVersion: zookeeper.stackable.tech/v1alpha1
-kind: ZookeeperZnode
-metadata:
-  name: nifi-znode
-spec:
-  clusterRef:
-    name: zookeeper
diff --git a/stacks/end-to-end-security/superset.yaml b/stacks/end-to-end-security/superset.yaml
index ba55aa4c..b5f0c431 100644
--- a/stacks/end-to-end-security/superset.yaml
+++ b/stacks/end-to-end-security/superset.yaml
@@ -7,7 +7,6 @@ spec:
   image:
     productVersion: 4.1.2
   clusterConfig:
-    listenerClass: external-unstable
     credentialsSecret: superset-credentials
     mapboxSecret: superset-mapbox-api-key
     authentication:
@@ -16,6 +15,8 @@ spec:
           clientCredentialsSecret: superset-keycloak-client
         userRegistrationRole: Gamma_extended
   nodes:
+    config:
+      listenerClass: external-unstable
     roleGroups:
       default:
         replicas: 1
diff --git a/stacks/keycloak-opa-poc/superset.yaml b/stacks/keycloak-opa-poc/superset.yaml
index 9abcab4c..e5bae535 100644
--- a/stacks/keycloak-opa-poc/superset.yaml
+++ b/stacks/keycloak-opa-poc/superset.yaml
@@ -22,11 +22,12 @@ spec:
     productVersion: 4.1.2
   clusterConfig:
     credentialsSecret: superset-credentials
-    listenerClass: external-unstable
   nodes:
     roleGroups:
       default:
         replicas: 1
+    config:
+      listenerClass: external-unstable
     configOverrides:
       superset_config.py:
         AUTH_TYPE: AUTH_OAUTH
diff --git a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
index 0be60c2a..39dd404f 100644
--- a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
@@ -13,7 +13,6 @@ spec:
     sensitiveProperties:
       keySecret: nifi-sensitive-property-key
       autoGenerate: true
-    zookeeperConfigMapName: nifi-znode
   nodes:
     config:
       resources:
@@ -53,11 +52,3 @@ metadata:
   name: nifi-admin-credentials-secret
 stringData:
   admin: {{ nifiAdminPassword }}
----
-apiVersion: zookeeper.stackable.tech/v1alpha1
-kind: ZookeeperZnode
-metadata:
-  name: nifi-znode
-spec:
-  clusterRef:
-    name: zookeeper
diff --git a/stacks/nifi-kafka-druid-superset-s3/superset.yaml b/stacks/nifi-kafka-druid-superset-s3/superset.yaml
index c7a65bca..67adbdc6 100644
--- a/stacks/nifi-kafka-druid-superset-s3/superset.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/superset.yaml
@@ -7,10 +7,11 @@ spec:
   image:
     productVersion: 4.1.2
   clusterConfig:
-    listenerClass: external-unstable
     credentialsSecret: superset-credentials
     mapboxSecret: superset-mapbox-api-key
   nodes:
+    config:
+      listenerClass: external-unstable
     roleGroups:
       default:
         replicas: 1
diff --git a/stacks/signal-processing/nifi.yaml b/stacks/signal-processing/nifi.yaml
index 6f8bd2f0..18c39617 100644
--- a/stacks/signal-processing/nifi.yaml
+++ b/stacks/signal-processing/nifi.yaml
@@ -12,7 +12,6 @@ spec:
     # pullPolicy: IfNotPresent
   clusterConfig:
     listenerClass: external-unstable
-    zookeeperConfigMapName: nifi-znode
     authentication:
       - authenticationClass: nifi-users
     sensitiveProperties:
@@ -57,11 +56,3 @@ metadata:
   name: nifi-admin-credentials
 stringData:
   admin: {{ nifiAdminPassword }}
----
-apiVersion: zookeeper.stackable.tech/v1alpha1
-kind: ZookeeperZnode
-metadata:
-  name: nifi-znode
-spec:
-  clusterRef:
-    name: zookeeper
diff --git a/stacks/stacks-v2.yaml b/stacks/stacks-v2.yaml
index b6a96159..f8f91352 100644
--- a/stacks/stacks-v2.yaml
+++ b/stacks/stacks-v2.yaml
@@ -629,7 +629,6 @@ stacks:
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/signal-processing/grafana-dashboards.yaml
       - helmChart: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/signal-processing/grafana.yaml
       - helmChart: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/_templates/postgresql-timescaledb.yaml
-      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/nifi-kafka-druid-superset-s3/zookeeper.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/signal-processing/nifi.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/jupyterhub-pyspark-hdfs/serviceaccount.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml
diff --git a/stacks/trino-superset-s3/superset.yaml b/stacks/trino-superset-s3/superset.yaml
index c2d633e8..47e3d96b 100644
--- a/stacks/trino-superset-s3/superset.yaml
+++ b/stacks/trino-superset-s3/superset.yaml
@@ -7,10 +7,11 @@ spec:
   image:
     productVersion: 4.1.2
   clusterConfig:
-    listenerClass: external-unstable
     credentialsSecret: superset-credentials
     mapboxSecret: superset-mapbox-api-key
   nodes:
+    config:
+      listenerClass: external-unstable
     roleGroups:
       default:
         replicas: 1