diff --git a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml
index 2c25c32c..094202b9 100644
--- a/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml
+++ b/demos/nifi-kafka-druid-earthquake-data/create-druid-ingestion-job.yaml
@@ -17,7 +17,7 @@ spec:
             - -c
             - |
               echo 'Waiting for Druid Coordinator to be created'
-              kubectl wait --for=create pod/druid-coordinator-default-0
+              kubectl wait --for=create pod/druid-coordinator-default-0 --timeout=30m
               echo 'Waiting for Druid Coordinator to be ready'
               kubectl wait --for=condition=Ready pod/druid-coordinator-default-0 --timeout=30m
       containers:
@@ -52,7 +52,7 @@ data:
         "ioConfig": {
           "type": "kafka",
           "consumerProperties": {
-            "bootstrap.servers": "kafka-broker-default.default.svc.cluster.local:9093",
+            "bootstrap.servers": "kafka-broker-default-headless.default.svc.cluster.local:9093",
             "security.protocol": "SSL",
             "ssl.truststore.location": "/stackable/tls/truststore.p12",
             "ssl.truststore.password": "changeit",
diff --git a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
index 882f77d7..30515844 100644
--- a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
+++ b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
@@ -17,7 +17,7 @@ spec:
             - -c
             - |
               echo 'Waiting for Druid Coordinator to be created'
-              kubectl wait --for=create pod/druid-coordinator-default-0
+              kubectl wait --for=create pod/druid-coordinator-default-0 --timeout=30m
               echo 'Waiting for Druid Coordinator to be ready'
               kubectl wait --for=condition=Ready pod/druid-coordinator-default-0 --timeout=30m
       containers:
@@ -54,7 +54,7 @@ data:
         "ioConfig": {
           "type": "kafka",
           "consumerProperties": {
-            "bootstrap.servers": "kafka-broker-default.default.svc.cluster.local:9093",
+            "bootstrap.servers": "kafka-broker-default-headless.default.svc.cluster.local:9093",
             "security.protocol": "SSL",
             "ssl.truststore.location": "/stackable/tls/truststore.p12",
             "ssl.truststore.password": "changeit",
@@ -133,7 +133,7 @@ data:
         "ioConfig": {
           "type": "kafka",
           "consumerProperties": {
-            "bootstrap.servers": "kafka-broker-default.default.svc.cluster.local:9093",
+            "bootstrap.servers": "kafka-broker-default-headless.default.svc.cluster.local:9093",
             "security.protocol": "SSL",
             "ssl.truststore.location": "/stackable/tls/truststore.p12",
             "ssl.truststore.password": "changeit",
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml b/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml
deleted file mode 100644
index 90e543bb..00000000
--- a/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-apiVersion: zookeeper.stackable.tech/v1alpha1
-kind: ZookeeperCluster
-metadata:
-  name: zookeeper
-spec:
-  image:
-    productVersion: 3.9.4
-  servers:
-    roleGroups:
-      default:
-        replicas: 3
diff --git a/stacks/end-to-end-security/hive-metastore.yaml b/stacks/end-to-end-security/hive-metastore.yaml
index e1c08899..18044e12 100644
--- a/stacks/end-to-end-security/hive-metastore.yaml
+++ b/stacks/end-to-end-security/hive-metastore.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hive-iceberg
 spec:
   image:
-    productVersion: 4.0.0
+    productVersion: 4.1.0
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive
diff --git a/stacks/stacks-v2.yaml b/stacks/stacks-v2.yaml
index c8a5c45a..53454ebb 100644
--- a/stacks/stacks-v2.yaml
+++ b/stacks/stacks-v2.yaml
@@ -189,7 +189,6 @@ stacks:
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/s3-connection.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/trino.yaml
-      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/zookeeper.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
       - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/nifi-kafka-druid-superset-s3/superset.yaml # Reuse