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 d120f853..50aae834 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
@@ -29,7 +29,7 @@ spec:
             - pipefail
             - -c
             - |
-              curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor
+              curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/ingestion-job-spec.json https://druid-coordinator.{{ NAMESPACE }}.svc.cluster.local:8281/druid/indexer/v1/supervisor
           volumeMounts:
             - name: ingestion-job-spec
               mountPath: /tmp/ingestion-job-spec
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 c8b7c2ce..e852beb9 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
@@ -29,9 +29,9 @@ spec:
             - pipefail
             - -c
             - |
-              curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/stations-ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor
-              curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor
-              curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-compaction-job-spec.json https://druid-coordinator:8281/druid/coordinator/v1/config/compaction
+              curl --fail -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/stations-ingestion-job-spec.json https://druid-coordinator.{{ NAMESPACE }}.svc.cluster.local:8281/druid/indexer/v1/supervisor
+              curl --fail -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-ingestion-job-spec.json https://druid-coordinator.{{ NAMESPACE }}.svc.cluster.local:8281/druid/indexer/v1/supervisor
+              curl --fail -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-compaction-job-spec.json https://druid-coordinator.{{ NAMESPACE }}.svc.cluster.local:8281/druid/coordinator/v1/config/compaction
           volumeMounts:
             - name: ingestion-job-spec
               mountPath: /tmp/ingestion-job-spec
diff --git a/stacks/nifi-kafka-druid-superset-s3/druid.yaml b/stacks/nifi-kafka-druid-superset-s3/druid.yaml
index 550f4980..f079bba1 100644
--- a/stacks/nifi-kafka-druid-superset-s3/druid.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/druid.yaml
@@ -30,44 +30,51 @@ spec:
   brokers:
     roleConfig:
       listenerClass: external-stable
+    configOverrides: &configOverrides
+      runtime.properties:
+        druid.server.http.enforceStrictSNIHostChecking: "false"
     roleGroups:
       default:
         replicas: 1
   coordinators:
     roleConfig:
       listenerClass: external-stable
+    configOverrides: *configOverrides
     roleGroups:
       default:
         replicas: 1
   historicals:
+    config:
+      resources:
+        cpu:
+          min: "1"
+          max: "2"
+        memory:
+          limit: 4Gi
+        storage:
+          segmentCache:
+            emptyDir:
+              capacity: 8Gi
+    configOverrides: *configOverrides
     roleGroups:
       default:
         replicas: 2
-        config:
-          resources:
-            cpu:
-              min: "1"
-              max: "2"
-            memory:
-              limit: 4Gi
-            storage:
-              segmentCache:
-                emptyDir:
-                  capacity: 8Gi
   middleManagers:
+    config:
+      resources:
+        cpu:
+          min: "1"
+          max: "4" # Need enough CPU cores to run multiple ingestion jobs at once
+        memory:
+          limit: 16Gi
     roleGroups:
       default:
         replicas: 1
-        config:
-          resources:
-            cpu:
-              min: "1"
-              max: "4" # Need enough CPU cores to run multiple ingestion jobs at once
-            memory:
-              limit: 16Gi
+    configOverrides: *configOverrides
   routers:
     roleConfig:
       listenerClass: external-stable
+    configOverrides: *configOverrides
     roleGroups:
       default:
         replicas: 1