diff --git a/CONNECTORS b/CONNECTORS
index d2a3725..e52fb77 100644
--- a/CONNECTORS
+++ b/CONNECTORS
@@ -1,6 +1,7 @@
-ndc-connector-oracle
-ndc-connector-phoenix
-ndc-graphql
-ndc-mongodb
-ndc-nodejs-lambda
+ndc-connector-oracle
+ndc-connector-phoenix
+ndc-elasticsearch
+ndc-graphql
+ndc-mongodb
+ndc-nodejs-lambda
 ndc-postgres
\ No newline at end of file
diff --git a/charts/ndc-connector-oracle/Chart.yaml b/charts/ndc-connector-oracle/Chart.yaml
index 5b9f09a..2196b98 100644
--- a/charts/ndc-connector-oracle/Chart.yaml
+++ b/charts/ndc-connector-oracle/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/ndc-connector-oracle/templates/secret.yaml b/charts/ndc-connector-oracle/templates/secret.yaml
index 7d7e22f..030957b 100644
--- a/charts/ndc-connector-oracle/templates/secret.yaml
+++ b/charts/ndc-connector-oracle/templates/secret.yaml
@@ -4,8 +4,8 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
-  JDBC_URL: {{ .Values.connectorEnvVars.JDBC_URL | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  JDBC_URL: {{ required "Error: .Values.connectorEnvVars.JDBC_URL is required!" .Values.connectorEnvVars.JDBC_URL | b64enc | quote }}
 {{- if .Values.observability.enabled }}
   otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/ndc-connector-phoenix/Chart.yaml b/charts/ndc-connector-phoenix/Chart.yaml
index d8c25fb..d3ab22d 100644
--- a/charts/ndc-connector-phoenix/Chart.yaml
+++ b/charts/ndc-connector-phoenix/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/ndc-connector-phoenix/templates/secret.yaml b/charts/ndc-connector-phoenix/templates/secret.yaml
index 7d7e22f..030957b 100644
--- a/charts/ndc-connector-phoenix/templates/secret.yaml
+++ b/charts/ndc-connector-phoenix/templates/secret.yaml
@@ -4,8 +4,8 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
-  JDBC_URL: {{ .Values.connectorEnvVars.JDBC_URL | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  JDBC_URL: {{ required "Error: .Values.connectorEnvVars.JDBC_URL is required!" .Values.connectorEnvVars.JDBC_URL | b64enc | quote }}
 {{- if .Values.observability.enabled }}
   otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/Chart.yaml b/charts/ndc-elasticsearch/Chart.yaml
new file mode 100644
index 0000000..c6738eb
--- /dev/null
+++ b/charts/ndc-elasticsearch/Chart.yaml
@@ -0,0 +1,29 @@
+apiVersion: v2
+name: ndc-elasticsearch
+description: (DDN) A Helm chart for deploying ndc-elasticsearch
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: v2024.10.28
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "3.0.0"
+
+dependencies:
+- name: common
+  version: 0.0.6
+  repository: oci://us-west1-docker.pkg.dev/hasura-ee/helm-charts
diff --git a/charts/ndc-elasticsearch/README.md b/charts/ndc-elasticsearch/README.md
new file mode 100644
index 0000000..5f0a00b
--- /dev/null
+++ b/charts/ndc-elasticsearch/README.md
@@ -0,0 +1,80 @@
+# Ndc-elasticsearch Helm Chart
+
+This chart deploys the ndc-elasticsearch connector. Refer to the pre-requisites section [here](../../README.md#get-started)
+
+## Install Chart
+
+See all [configuration](#parameters) below.
+
+```bash
+# EXAMPLES:
+
+# helm template and apply manifests via kubectl (example)
+helm template <release-name> \
+  --set image.repository="my_repo/ndc-elasticsearch" \
+  --set image.tag="my_custom_image_tag" \
+  --set connectorEnvVars.ELASTICSEARCH_URL="elasticsearch_url" \
+  --set connectorEnvVars.ELASTICSEARCH_USERNAME="elasticsearch_username" \
+  --set connectorEnvVars.ELASTICSEARCH_PASSWORD="elasticsearch_password" \
+  --set connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET="token" \
+  --set dataPlane.id="data_plane_id" \
+  --set dataPlane.key="data_plane_key" \
+  hasura-ddn/ndc-elasticsearch | kubectl apply -f-
+
+# helm upgrade --install (pass configuration via command line)
+helm upgrade --install <release-name> \
+  --set image.repository="my_repo/ndc-elasticsearch" \
+  --set image.tag="my_custom_image_tag" \
+  --set connectorEnvVars.ELASTICSEARCH_URL="elasticsearch_url" \
+  --set connectorEnvVars.ELASTICSEARCH_USERNAME="elasticsearch_username" \
+  --set connectorEnvVars.ELASTICSEARCH_PASSWORD="elasticsearch_password" \
+  --set connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET="token" \
+  --set dataPlane.id="data_plane_id" \
+  --set dataPlane.key="data_plane_key" \
+  hasura-ddn/ndc-elasticsearch
+```
+
+## Connector ENV Inputs
+
+| Name                                              | Description                                                                                                | Value                           |
+| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------------------------- |
+| `connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET`    | Hasura Service Token Secret (Required)                                                                     | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_URL`    | The comma-separated list of Elasticsearch host addresses for connection (Required)                                                                     | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_USERNAME`               | The username for authenticating to the Elasticsearch cluster (Required)                                                                            | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_PASSWORD`               | The password for the Elasticsearch user account (Required)                                                                            | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_API_KEY`               | The Elasticsearch API key for authenticating to the Elasticsearch cluster (Optional)                                                                            | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_CA_CERT_PATH`               | The path to the Certificate Authority (CA) certificate for verifying the Elasticsearch server's SSL certificate (Optional)                                                                            | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_INDEX_PATTERN`               | The pattern for matching Elasticsearch indices, potentially including wildcards, used by the connector (Optional)                                                                            | `""`                            |
+| `connectorEnvVars.ELASTICSEARCH_DEFAULT_RESULT_SIZE`               | The default query size when no limit is applied. Defaults to 10,000 (Optional)                                                                            | `""`                            |
+
+
+## Additional Parameters
+
+| Name                                              | Description                                                                                                | Value                           |
+| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------------------------- |
+| `namespace`                                       | Namespace to deploy to                                                                                     | `"default"`                     |
+| `image.repository`                                | Image repository containing custom created ndc-elasticsearch                                                    | `""`                            |
+| `image.tag`                                       | Image tag to use for custom created ndc-elasticsearch                                                           | `""`                            |
+| `image.pullPolicy`                                | Image pull policy                                                                                          | `Always`                        |
+| `image.otelCollectorRepository`                   | OTEL collector image repository                                                                            | `otel/opentelemetry-collector`  |
+| `image.otelCollectorTag`                          | OTEL collector image tag                                                                                   | `0.104.0`                       |
+| `observability.enabled`                           | Deploy OTEL collector as sidecar                                                                           | `true`                          |
+| `dataPlane.id`                                    | Data Plane ID (Required when observability.enabled is set to true)                                         | `""`                         |
+| `dataPlane.key`                                   | Data Plane Key (Required when observability.enabled is set to true)                                        | `""`                         |
+| `controlPlane.otlpEndpoint`                       | OTEL endpoint under Hasura                                                                                 | `"https://gateway.otlp.hasura.io:443"`                         |
+| `controlPlane.oauthTokenEndpoint`                 | Oauth Token URL                                                                                            | `"https://ddn-oauth.pro.hasura.io/oauth2/token"`                         |
+| `extraVolumes`                                    | Optionally specify extra list of additional volumes for the ndc-elasticsearch pod                               | `[]`                            |
+| `extraContainers`                                 | Optionally specify extra list of additional containers for the ndc-elasticsearch pod                            | `[]`                               |                               |
+| `resources`                                       | Resource requests and limits of ndc-elasticsearch container                                                     | `{}`                            |
+| `env`                                             | Env variable section for ndc-elasticsearch                                                                      | `[]`                            |
+| `replicas`                                        | Replicas setting for pod                                                                                   | `1`                             |
+| `wsInactiveExpiryMins`                            | To be documented                                                                                           | `1`                             |
+| `securityContext`                                 | Define privilege and access control settings for a Pod or Container                                        | `{}`                            |
+| `healthChecks.enabled`                            | Enable health check for ndc-elasticsearch container                                                             | `false`                         |
+| `healthChecks.livenessProbePath`                  | Health check liveness Probe path ndc-elasticsearch container                                                    | `"/healthz"`                    |
+| `healthChecks.readinessProbePath`                 | Health check readiness Probe path ndc-elasticsearch container                                                   | `"/healthz"`                    |
+| `hpa.enabled`                                     | Enable HPA for ndc-elasticsearch.  Ensure metrics cluster is configured when enabling                           | `false`                         |
+| `hpa.minReplicas`                                 | minReplicas setting for HPA                                                                                | `2`                             |
+| `hpa.maxReplicas`                                 | maxReplicas setting for HPA                                                                                | `4`                             |
+| `hpa.metrics.resource.name`                       | Resource name to autoscale on                                                                              | ``                              |
+| `hpa.metrics.resource.target.averageUtilization`  | Utilization target on specific resource type                                                               | ``                              |
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/NOTES.txt b/charts/ndc-elasticsearch/templates/NOTES.txt
new file mode 100644
index 0000000..bef4857
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/NOTES.txt
@@ -0,0 +1,22 @@
+Ndc-elasticsearch Helm Chart Deployment
+
+1. Deployment Information:
+   - Release Name: {{ .Release.Name }}
+   - Namespace: {{ template "common.namespace" . }}
+   - Chart Name: {{ .Chart.Name }}
+   - Chart Version: {{ .Chart.Version }}
+
+2. Service Information:
+   - Service Name: {{ template "common.name" . }}
+   - Service Port: {{ .Values.httpPort }}
+
+3. Useful Commands:
+   - Check the Deployment Status:
+     helm status {{ .Release.Name }}
+
+   - Get Detailed Information about the Deployment:
+     helm get all {{ .Release.Name }}
+
+4. Clean Up:
+   - To uninstall/delete the deployment, run:
+     helm uninstall {{ .Release.Name }}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/deployment.yaml b/charts/ndc-elasticsearch/templates/deployment.yaml
new file mode 100644
index 0000000..96fb6e0
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/deployment.yaml
@@ -0,0 +1,2 @@
+# deployment.yaml
+{{- template "common.deployment" . -}}
diff --git a/charts/ndc-elasticsearch/templates/hpa.yaml b/charts/ndc-elasticsearch/templates/hpa.yaml
new file mode 100644
index 0000000..f40ea32
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/hpa.yaml
@@ -0,0 +1,2 @@
+# hpa.yaml
+{{- template "common.hpa" . -}}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/imagepullsecret.yaml b/charts/ndc-elasticsearch/templates/imagepullsecret.yaml
new file mode 100644
index 0000000..679ba77
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/imagepullsecret.yaml
@@ -0,0 +1,16 @@
+{{- if ((.Values.global).dataPlane).deployImagePullSecret -}}
+{{- with .Values.secrets }}
+{{- if .imagePullSecret -}}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: hasura-image-pull
+  namespace: {{ template "common.namespace" $ }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: |
+{{- toJson .imagePullSecret | b64enc | nindent 4 }}
+{{- end }}
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/secret.yaml b/charts/ndc-elasticsearch/templates/secret.yaml
new file mode 100644
index 0000000..4b668c1
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/secret.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ printf "%s-secret" (include "common.name" .) }}
+  namespace: {{ template "common.namespace" $ }}
+data:
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  ELASTICSEARCH_URL: {{ required "Error: .Values.connectorEnvVars.ELASTICSEARCH_URL is required!" .Values.connectorEnvVars.ELASTICSEARCH_URL | b64enc | quote }}
+  ELASTICSEARCH_USERNAME: {{ required "Error: .Values.connectorEnvVars.ELASTICSEARCH_USERNAME is required!" .Values.connectorEnvVars.ELASTICSEARCH_USERNAME | b64enc | quote }}
+  ELASTICSEARCH_PASSWORD: {{ required "Error: .Values.connectorEnvVars.ELASTICSEARCH_PASSWORD is required!" .Values.connectorEnvVars.ELASTICSEARCH_PASSWORD | b64enc | quote }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_API_KEY }}
+  ELASTICSEARCH_API_KEY: {{ .Values.connectorEnvVars.ELASTICSEARCH_API_KEY | b64enc | quote }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_CA_CERT_PATH }}
+  ELASTICSEARCH_CA_CERT_PATH: {{ .Values.connectorEnvVars.ELASTICSEARCH_CA_CERT_PATH | b64enc | quote }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_INDEX_PATTERN }}
+  ELASTICSEARCH_INDEX_PATTERN: {{ .Values.connectorEnvVars.ELASTICSEARCH_INDEX_PATTERN | b64enc | quote }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_DEFAULT_RESULT_SIZE }}
+  ELASTICSEARCH_DEFAULT_RESULT_SIZE: {{ .Values.connectorEnvVars.ELASTICSEARCH_DEFAULT_RESULT_SIZE | b64enc | quote }}
+  {{- end }}
+{{- if .Values.observability.enabled }}
+  otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/service.yaml b/charts/ndc-elasticsearch/templates/service.yaml
new file mode 100644
index 0000000..7356445
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/service.yaml
@@ -0,0 +1,2 @@
+# service.yaml
+{{- template "common.service" . -}}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/templates/serviceaccount.yaml b/charts/ndc-elasticsearch/templates/serviceaccount.yaml
new file mode 100644
index 0000000..030a351
--- /dev/null
+++ b/charts/ndc-elasticsearch/templates/serviceaccount.yaml
@@ -0,0 +1,2 @@
+# serviceaccount.yaml
+{{- template "common.serviceaccount" . -}}
\ No newline at end of file
diff --git a/charts/ndc-elasticsearch/values.yaml b/charts/ndc-elasticsearch/values.yaml
new file mode 100644
index 0000000..a1ef644
--- /dev/null
+++ b/charts/ndc-elasticsearch/values.yaml
@@ -0,0 +1,202 @@
+namespace: "default"
+useReleaseName: true
+
+additionalAnnotations: |
+  checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+
+# Container Configs
+image:
+  repository: "ghcr.io/hasura/ndc-elasticsearch"
+  tag: "latest"
+  pullPolicy: Always
+  otelCollectorRepository: otel/opentelemetry-collector-contrib
+  otelCollectorTag: 0.104.0
+replicas: "1"
+wsInactiveExpiryMins: "1"
+securityContext:
+  runAsNonRoot: true
+  runAsGroup: 1000
+  runAsUser: 100
+  fsGroup: 1000
+
+healthChecks:
+  enabled: false
+  livenessProbePath: "/healthz"
+  readinessProbePath: "/healthz"
+
+hpa:
+  enabled: false
+  minReplicas: 2
+  maxReplicas: 4
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 50  # Target 50% CPU utilization per pod
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: 80  # Target 80% memory utilization per pod
+
+# Observability defaults are tuned for Hasura hosted Control Plane
+# Enable observability
+observability:
+  enabled: true
+
+# Required (when observability.enabled is set to true)
+dataPlane:
+  id: ""
+  key: ""
+
+controlPlane:
+  otlpEndpoint: https://gateway.otlp.hasura.io:443
+  oauthTokenEndpoint: https://ddn-oauth.pro.hasura.io/oauth2/token
+
+otel:
+  config: |
+    extensions:
+      oauth2client:
+        client_id: {{ required "Error: .Values.dataPlane.id is required!" .Values.dataPlane.id }}
+        client_secret: {{ required "Error: .Values.dataPlane.key is required!" .Values.dataPlane.key }}
+        token_url: {{ .Values.controlPlane.oauthTokenEndpoint }}
+        scopes: ["opentelemetry:write"]
+        endpoint_params:
+          audience: https://ddn.hasura.io
+    exporters:
+      otlp/oauth:
+        endpoint: {{ .Values.controlPlane.otlpEndpoint }}
+        auth:
+          authenticator: oauth2client
+    processors:
+      batch: {}
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: 0.0.0.0:4317
+          http:
+            endpoint: 0.0.0.0:4318
+    service:
+      extensions: [oauth2client]
+      pipelines:
+        logs:
+          exporters:
+            - otlp/oauth
+          processors:
+            - batch
+          receivers:
+            - otlp
+        metrics:
+          exporters:
+            - otlp/oauth
+          processors:
+            - batch
+          receivers:
+            - otlp
+        traces:
+          exporters:
+            - otlp/oauth
+          processors:
+            - batch
+          receivers:
+            - otlp
+
+extraVolumes: |
+  {{- if .Values.observability.enabled }}
+  - name: otel-config
+    secret:
+      secretName: {{ printf "%s-secret" (include "common.name" .) }}
+      items:
+        - key: otel-collector-config.yaml
+          path: otel-collector-config.yaml
+  {{- end }}
+
+extraContainers: |
+  {{- if .Values.observability.enabled }}
+  - name: "otel-collector"
+    command:
+      - --config=/etc/otel-collector-config.yaml
+    command:
+    image: {{ template "common.image" (dict "Values" $.Values "repository" .Values.image.otelCollectorRepository "tag" .Values.image.otelCollectorTag) }}
+    env:
+    - name: "OTEL_ENDPOINT"
+      value: "{{ .Values.controlPlane.otlpEndpoint }}"
+    volumeMounts:
+      - name: otel-config
+        mountPath: "/etc/otelcol-contrib/config.yaml"
+        subPath: otel-collector-config.yaml
+  {{- end }}
+
+resources: |
+  requests:
+    cpu: "500m"
+    memory: "500Mi"
+  limits:
+    cpu: "1"
+    memory: "1Gi"
+
+connectorEnvVars:
+  HASURA_SERVICE_TOKEN_SECRET: ""
+  ELASTICSEARCH_URL: ""
+  ELASTICSEARCH_USERNAME: ""
+  ELASTICSEARCH_PASSWORD: ""
+  ELASTICSEARCH_API_KEY: ""
+  ELASTICSEARCH_CA_CERT_PATH: ""
+  ELASTICSEARCH_INDEX_PATTERN: ""
+  ELASTICSEARCH_DEFAULT_RESULT_SIZE: ""
+
+env: |
+  - name: HASURA_SERVICE_TOKEN_SECRET
+    valueFrom:
+      secretKeyRef:
+        key: HASURA_SERVICE_TOKEN_SECRET
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  - name: ELASTICSEARCH_URL
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_URL
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  - name: ELASTICSEARCH_USERNAME
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_USERNAME
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  - name: ELASTICSEARCH_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_PASSWORD
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_API_KEY }}
+  - name: ELASTICSEARCH_API_KEY
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_API_KEY
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_CA_CERT_PATH }}
+  - name: ELASTICSEARCH_CA_CERT_PATH
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_CA_CERT_PATH
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_INDEX_PATTERN }}
+  - name: ELASTICSEARCH_INDEX_PATTERN
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_INDEX_PATTERN
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  {{- end }}
+  {{- if .Values.connectorEnvVars.ELASTICSEARCH_DEFAULT_RESULT_SIZE }}
+  - name: ELASTICSEARCH_DEFAULT_RESULT_SIZE
+    valueFrom:
+      secretKeyRef:
+        key: ELASTICSEARCH_DEFAULT_RESULT_SIZE
+        name: {{ printf "%s-secret" (include "common.name" .) }}
+  {{- end }}
+  - name: OTEL_EXPORTER_OTLP_ENDPOINT
+    value: http://localhost:4317
diff --git a/charts/ndc-graphql/Chart.yaml b/charts/ndc-graphql/Chart.yaml
index 5c3de79..6abb799 100644
--- a/charts/ndc-graphql/Chart.yaml
+++ b/charts/ndc-graphql/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -25,5 +25,5 @@ appVersion: "3.0.0"
 
 dependencies:
 - name: common
-  version: 0.0.5
+  version: 0.0.6
   repository: oci://us-west1-docker.pkg.dev/hasura-ee/helm-charts
diff --git a/charts/ndc-graphql/templates/secret.yaml b/charts/ndc-graphql/templates/secret.yaml
index edd4b36..c6b0c82 100644
--- a/charts/ndc-graphql/templates/secret.yaml
+++ b/charts/ndc-graphql/templates/secret.yaml
@@ -4,8 +4,8 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
-  GRAPHQL_ENDPOINT: {{ .Values.connectorEnvVars.GRAPHQL_ENDPOINT | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  GRAPHQL_ENDPOINT: {{ required "Error: .Values.connectorEnvVars.GRAPHQL_ENDPOINT is required!" .Values.connectorEnvVars.GRAPHQL_ENDPOINT | b64enc | quote }}
 {{- if .Values.observability.enabled }}
   otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
 {{- end }}
diff --git a/charts/ndc-mongodb/Chart.yaml b/charts/ndc-mongodb/Chart.yaml
index 4c13a8a..a0d1f00 100644
--- a/charts/ndc-mongodb/Chart.yaml
+++ b/charts/ndc-mongodb/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/ndc-mongodb/templates/secret.yaml b/charts/ndc-mongodb/templates/secret.yaml
index 709bada..19b4a4c 100644
--- a/charts/ndc-mongodb/templates/secret.yaml
+++ b/charts/ndc-mongodb/templates/secret.yaml
@@ -4,8 +4,8 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
-  MONGODB_DATABASE_URI: {{ .Values.connectorEnvVars.MONGODB_DATABASE_URI | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  MONGODB_DATABASE_URI: {{ required "Error: .Values.connectorEnvVars.MONGODB_DATABASE_URI is required!" .Values.connectorEnvVars.MONGODB_DATABASE_URI | b64enc | quote }}
 {{- if .Values.observability.enabled }}
   otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/ndc-nodejs-lambda/Chart.yaml b/charts/ndc-nodejs-lambda/Chart.yaml
index 96fe8bb..6e9d263 100644
--- a/charts/ndc-nodejs-lambda/Chart.yaml
+++ b/charts/ndc-nodejs-lambda/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -25,5 +25,5 @@ appVersion: "3.0.0"
 
 dependencies:
 - name: common
-  version: 0.0.5
+  version: 0.0.6
   repository: oci://us-west1-docker.pkg.dev/hasura-ee/helm-charts
diff --git a/charts/ndc-nodejs-lambda/templates/secret.yaml b/charts/ndc-nodejs-lambda/templates/secret.yaml
index a87909d..027f8d3 100644
--- a/charts/ndc-nodejs-lambda/templates/secret.yaml
+++ b/charts/ndc-nodejs-lambda/templates/secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
 {{- if .Values.observability.enabled }}
   otel-collector-config.yaml: {{ (tpl .Values.otel.config .) | b64enc | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/ndc-postgres/Chart.yaml b/charts/ndc-postgres/Chart.yaml
index 92201d0..e2ff4c8 100644
--- a/charts/ndc-postgres/Chart.yaml
+++ b/charts/ndc-postgres/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2024.10.22
+version: v2024.10.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -25,5 +25,5 @@ appVersion: "3.0.0"
 
 dependencies:
 - name: common
-  version: 0.0.5
+  version: 0.0.6
   repository: oci://us-west1-docker.pkg.dev/hasura-ee/helm-charts
diff --git a/charts/ndc-postgres/templates/secret.yaml b/charts/ndc-postgres/templates/secret.yaml
index a1f974d..8b448c0 100644
--- a/charts/ndc-postgres/templates/secret.yaml
+++ b/charts/ndc-postgres/templates/secret.yaml
@@ -4,8 +4,8 @@ metadata:
   name: {{ printf "%s-secret" (include "common.name" .) }}
   namespace: {{ template "common.namespace" $ }}
 data:
-  HASURA_SERVICE_TOKEN_SECRET: {{ .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
-  CONNECTION_URI: {{ .Values.connectorEnvVars.CONNECTION_URI | b64enc | quote }}
+  HASURA_SERVICE_TOKEN_SECRET: {{ required "Error: .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET is required!" .Values.connectorEnvVars.HASURA_SERVICE_TOKEN_SECRET | b64enc | quote }}
+  CONNECTION_URI: {{ required "Error: .Values.connectorEnvVars.CONNECTION_URI is required!" .Values.connectorEnvVars.CONNECTION_URI | b64enc | quote }}
   {{- if .Values.connectorEnvVars.CLIENT_CERT }}
   CLIENT_CERT: {{ .Values.connectorEnvVars.CLIENT_CERT | b64enc | quote }}
   {{- end }}