diff --git a/.env.override b/.env.override
index 5ca1df5b89..8130a9185c 100644
--- a/.env.override
+++ b/.env.override
@@ -2,7 +2,7 @@
 # PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE
 
 # Demo Elastic App version
-IMAGE_VERSION=1.11.3
+IMAGE_VERSION=1.11.4
 IMAGE_NAME=ghcr.io/elastic/opentelemetry-demo
 
 # *********************
diff --git a/.github/README.md b/.github/README.md
index 4b00d463bb..ca2b98fdc7 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -49,9 +49,6 @@ Additionally, the OpenTelemetry Contrib collector has also been changed to the [
    # !(when an older helm open-telemetry repo exists) update the open-telemetry helm repo
    helm repo update open-telemetry
 
-   # deploy the configuration for the Elastic OpenTelemetry collector distribution
-   kubectl apply -f configmap-deployment.yaml
-
    # deploy the demo through helm install
    helm install -f deployment.yaml my-otel-demo open-telemetry/opentelemetry-demo
    ```
@@ -76,9 +73,6 @@ In order to add Node level metrics collection we can run an additional Otel coll
 2. Execute the following command to deploy the OpenTelemetry Collector to your Kubernetes cluster:
 
 ```
-# deploy the configuration for the Elastic OpenTelemetry collector distribution
-kubectl apply -f configmap-daemonset.yaml
-
 # deploy the Elastic OpenTelemetry collector distribution through helm install
 helm install otel-daemonset open-telemetry/opentelemetry-collector --values daemonset.yaml
 ```
diff --git a/kubernetes/elastic-helm/configmap-daemonset.yaml b/kubernetes/elastic-helm/configmap-daemonset.yaml
deleted file mode 100644
index e503076b4c..0000000000
--- a/kubernetes/elastic-helm/configmap-daemonset.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: elastic-otelcol-agent-ds
-  namespace: default
-  labels:
-    app.kubernetes.io/name: otelcol
-
-data:
-  relay: |
-    extensions:
-      health_check:
-        endpoint: ${env:MY_POD_IP}:13133
-    exporters:
-      debug:
-      elasticsearch:
-        endpoints:
-        - ${env:ELASTIC_ENDPOINT}
-        api_key: ${env:ELASTIC_API_KEY}
-        logs_dynamic_index:
-          enabled: true
-        metrics_dynamic_index:
-          enabled: true
-        mapping:
-          mode: ecs
-    processors:
-      batch: {}
-      elasticinframetrics:
-        add_system_metrics: true
-        add_k8s_metrics: true
-      resourcedetection/eks:
-        detectors: [env, eks]
-        timeout: 15s
-        override: true
-        eks:
-          resource_attributes:
-            k8s.cluster.name:
-              enabled: true
-      resourcedetection/gcp:
-        detectors: [env, gcp]
-        timeout: 2s
-        override: true
-      resource/k8s:
-        attributes:
-          - key: service.name
-            from_attribute: app.label.component
-            action: insert
-      attributes/k8s_logs_dataset:
-        actions:
-          - key: data_stream.dataset
-            value: "kubernetes.container_logs"
-            action: upsert
-      attributes/dataset:
-        actions:
-          - key: event.dataset
-            from_attribute: data_stream.dataset
-            action: upsert
-      resource/cloud:
-        attributes:
-          - key: cloud.instance.id
-            from_attribute: host.id
-            action: insert
-      resource/demo:
-        attributes:
-          - key: deployment.environment
-            value: "opentelemetry-demo"
-            action: upsert
-      resource/process:
-        attributes:
-          - key: process.executable.name
-            action: delete
-          - key: process.executable.path
-            action: delete
-      resourcedetection/system:
-        detectors: ["system", "ec2"]
-        system:
-          hostname_sources: [ "os" ]
-          resource_attributes:
-            host.name:
-              enabled: true
-            host.id:
-              enabled: false
-            host.arch:
-              enabled: true
-            host.ip:
-              enabled: true
-            host.mac:
-              enabled: true
-            host.cpu.vendor.id:
-              enabled: true
-            host.cpu.family:
-              enabled: true
-            host.cpu.model.id:
-              enabled: true
-            host.cpu.model.name:
-              enabled: true
-            host.cpu.stepping:
-              enabled: true
-            host.cpu.cache.l2.size:
-              enabled: true
-            os.description:
-              enabled: true
-            os.type:
-              enabled: true
-        ec2:
-          resource_attributes:
-            host.name:
-              enabled: false
-            host.id:
-              enabled: true
-      k8sattributes:
-        filter:
-          node_from_env_var: K8S_NODE_NAME
-        passthrough: false
-        pod_association:
-          - sources:
-              - from: resource_attribute
-                name: k8s.pod.ip
-          - sources:
-              - from: resource_attribute
-                name: k8s.pod.uid
-          - sources:
-              - from: connection
-        extract:
-          metadata:
-            - "k8s.namespace.name"
-            - "k8s.deployment.name"
-            - "k8s.statefulset.name"
-            - "k8s.daemonset.name"
-            - "k8s.cronjob.name"
-            - "k8s.job.name"
-            - "k8s.node.name"
-            - "k8s.pod.name"
-            - "k8s.pod.uid"
-            - "k8s.pod.start_time"
-          labels:
-            - tag_name: app.label.component
-              key: app.kubernetes.io/component
-              from: pod
-    receivers:
-      filelog:
-        retry_on_failure:
-          enabled: true
-        start_at: end
-        exclude:
-        # exlude collector logs
-        - /var/log/pods/*/opentelemetry-collector/*.log
-        include:
-        - /var/log/pods/*/*/*.log
-        include_file_name: false
-        include_file_path: true
-        operators:
-        - id: container-parser
-          type: container
-      hostmetrics:
-        collection_interval: 10s
-        root_path: /hostfs
-        scrapers:
-          cpu:
-            metrics:
-              system.cpu.utilization:
-                enabled: true
-              system.cpu.logical.count:
-                enabled: true
-          memory:
-            metrics:
-              system.memory.utilization:
-                enabled: true
-          process:
-            mute_process_exe_error: true
-            mute_process_io_error: true
-            mute_process_user_error: true
-            metrics:
-              process.threads:
-                enabled: true
-              process.open_file_descriptors:
-                enabled: true
-              process.memory.utilization:
-                enabled: true
-              process.disk.operations:
-                enabled: true
-          network:
-          processes:
-          load:
-          disk:
-          filesystem:
-            exclude_mount_points:
-              mount_points:
-                - /dev/*
-                - /proc/*
-                - /sys/*
-                - /run/k3s/containerd/*
-                - /var/lib/docker/*
-                - /var/lib/kubelet/*
-                - /snap/*
-              match_type: regexp
-            exclude_fs_types:
-              fs_types:
-                - autofs
-                - binfmt_misc
-                - bpf
-                - cgroup2
-                - configfs
-                - debugfs
-                - devpts
-                - devtmpfs
-                - fusectl
-                - hugetlbfs
-                - iso9660
-                - mqueue
-                - nsfs
-                - overlay
-                - proc
-                - procfs
-                - pstore
-                - rpc_pipefs
-                - securityfs
-                - selinuxfs
-                - squashfs
-                - sysfs
-                - tracefs
-              match_type: strict
-      kubeletstats:
-        auth_type: serviceAccount
-        collection_interval: 20s
-        endpoint: ${env:K8S_NODE_NAME}:10250
-        node: '${env:K8S_NODE_NAME}'
-        # Required to work for all CSPs without an issue
-        insecure_skip_verify: true
-        k8s_api_config:
-          auth_type: serviceAccount
-        metrics:
-          k8s.pod.memory.node.utilization:
-            enabled: true
-          k8s.pod.cpu.node.utilization:
-            enabled: true
-          k8s.container.cpu_limit_utilization:
-            enabled: true
-          k8s.pod.cpu_limit_utilization:
-            enabled: true
-          k8s.container.cpu_request_utilization:
-            enabled: true
-          k8s.container.memory_limit_utilization:
-            enabled: true
-          k8s.pod.memory_limit_utilization:
-            enabled: true
-          k8s.container.memory_request_utilization:
-            enabled: true
-          k8s.node.uptime:
-            enabled: true
-          k8s.node.cpu.usage:
-            enabled: true
-          k8s.pod.cpu.usage:
-            enabled: true
-        extra_metadata_labels:
-          - container.id
-    service:
-      extensions: [health_check]
-      pipelines:
-        logs:
-          receivers: [filelog]
-          processors: [batch, k8sattributes, resourcedetection/system, resourcedetection/eks, resourcedetection/gcp, resource/demo, resource/k8s, resource/cloud, attributes/k8s_logs_dataset]
-          exporters: [debug, elasticsearch]
-        metrics:
-          receivers: [hostmetrics, kubeletstats]
-          processors: [batch, k8sattributes, elasticinframetrics, resourcedetection/system, resource/demo, resourcedetection/eks, resourcedetection/gcp, resource/k8s, resource/cloud, attributes/dataset, resource/process]
-          exporters: [debug, elasticsearch]
-      telemetry:
-        metrics:
-          address: ${env:MY_POD_IP}:8888
diff --git a/kubernetes/elastic-helm/configmap-deployment.yaml b/kubernetes/elastic-helm/configmap-deployment.yaml
deleted file mode 100644
index 862007ec29..0000000000
--- a/kubernetes/elastic-helm/configmap-deployment.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: elastic-otelcol-agent
-  namespace: default
-  labels:
-    app.kubernetes.io/name: otelcol
-
-data:
-  relay: |
-    extensions:
-      health_check:
-        endpoint: ${env:MY_POD_IP}:13133
-    connectors:
-      spanmetrics: {}
-    exporters:
-      debug: {}
-      otlp/elastic:
-        endpoint: ${env:ELASTIC_APM_ENDPOINT}
-        compression: none
-        headers:
-          Authorization: Bearer ${env:ELASTIC_APM_SECRET_TOKEN}
-    processors:
-      batch: {}
-      resource:
-        attributes:
-          - key: deployment.environment
-            value: "opentelemetry-demo"
-            action: upsert
-    receivers:
-      httpcheck/frontendproxy:
-        targets:
-        - endpoint: http://example-frontendproxy:8080
-      otlp:
-        protocols:
-          grpc:
-            endpoint: ${env:MY_POD_IP}:4317
-          http:
-            cors:
-              allowed_origins:
-              - http://*
-              - https://*
-            endpoint: ${env:MY_POD_IP}:4318
-    service:
-      extensions:
-        - health_check
-      pipelines:
-        logs:
-          exporters:
-          - debug
-          - otlp/elastic
-          processors:
-          - batch
-          - resource
-          receivers:
-          - otlp
-        metrics:
-          exporters:
-          - otlp/elastic
-          - debug
-          processors:
-          - batch
-          - resource
-          receivers:
-          - httpcheck/frontendproxy
-          - otlp
-          - spanmetrics
-        traces:
-          exporters:
-          - otlp/elastic
-          - debug
-          - spanmetrics
-          processors:
-          - batch
-          - resource
-          receivers:
-          - otlp
-      telemetry:
-        metrics:
-          address: ${env:MY_POD_IP}:8888
-
diff --git a/kubernetes/elastic-helm/daemonset.yaml b/kubernetes/elastic-helm/daemonset.yaml
index 91a3d6fcb9..148c4d2fba 100644
--- a/kubernetes/elastic-helm/daemonset.yaml
+++ b/kubernetes/elastic-helm/daemonset.yaml
@@ -35,10 +35,6 @@ extraEnvs:
       fieldRef:
         fieldPath: spec.nodeName
 
-configMap:
-  create: false
-  existingName: elastic-otelcol-agent-ds
-
 # kubeletstats additional rules for Node metrics
 clusterRole:
   create: true
@@ -57,3 +53,271 @@ clusterRole:
         - get
         - watch
         - list
+
+config:
+  extensions:
+    health_check:
+      endpoint: ${env:MY_POD_IP}:13133
+  exporters:
+    debug:
+      verbosity: basic
+    elasticsearch:
+      endpoints:
+      - ${env:ELASTIC_ENDPOINT}
+      api_key: ${env:ELASTIC_API_KEY}
+      logs_dynamic_index:
+        enabled: true
+      metrics_dynamic_index:
+        enabled: true
+      mapping:
+        mode: ecs
+  processors:
+    batch: {}
+    elasticinframetrics:
+      add_system_metrics: true
+      add_k8s_metrics: true
+    resourcedetection/eks:
+      detectors: [env, eks]
+      timeout: 15s
+      override: true
+      eks:
+        resource_attributes:
+          k8s.cluster.name:
+            enabled: true
+    resourcedetection/gcp:
+      detectors: [env, gcp]
+      timeout: 2s
+      override: true
+    resource/k8s:
+      attributes:
+        - key: service.name
+          from_attribute: app.label.component
+          action: insert
+    attributes/k8s_logs_dataset:
+      actions:
+        - key: data_stream.dataset
+          value: "kubernetes.container_logs"
+          action: upsert
+    attributes/dataset:
+      actions:
+        - key: event.dataset
+          from_attribute: data_stream.dataset
+          action: upsert
+    resource/cloud:
+      attributes:
+        - key: cloud.instance.id
+          from_attribute: host.id
+          action: insert
+    resource/demo:
+      attributes:
+        - key: deployment.environment
+          value: "opentelemetry-demo"
+          action: upsert
+    resource/process:
+      attributes:
+        - key: process.executable.name
+          action: delete
+        - key: process.executable.path
+          action: delete
+    resourcedetection/system:
+      detectors: ["system", "ec2"]
+      system:
+        hostname_sources: [ "os" ]
+        resource_attributes:
+          host.name:
+            enabled: true
+          host.id:
+            enabled: false
+          host.arch:
+            enabled: true
+          host.ip:
+            enabled: true
+          host.mac:
+            enabled: true
+          host.cpu.vendor.id:
+            enabled: true
+          host.cpu.family:
+            enabled: true
+          host.cpu.model.id:
+            enabled: true
+          host.cpu.model.name:
+            enabled: true
+          host.cpu.stepping:
+            enabled: true
+          host.cpu.cache.l2.size:
+            enabled: true
+          os.description:
+            enabled: true
+          os.type:
+            enabled: true
+      ec2:
+        resource_attributes:
+          host.name:
+            enabled: false
+          host.id:
+            enabled: true
+    k8sattributes:
+      filter:
+        node_from_env_var: K8S_NODE_NAME
+      passthrough: false
+      pod_association:
+        - sources:
+            - from: resource_attribute
+              name: k8s.pod.ip
+        - sources:
+            - from: resource_attribute
+              name: k8s.pod.uid
+        - sources:
+            - from: connection
+      extract:
+        metadata:
+          - "k8s.namespace.name"
+          - "k8s.deployment.name"
+          - "k8s.statefulset.name"
+          - "k8s.daemonset.name"
+          - "k8s.cronjob.name"
+          - "k8s.job.name"
+          - "k8s.node.name"
+          - "k8s.pod.name"
+          - "k8s.pod.uid"
+          - "k8s.pod.start_time"
+        labels:
+          - tag_name: app.label.component
+            key: app.kubernetes.io/component
+            from: pod
+  receivers:
+    otlp: null
+    jaeger: null
+    prometheus: null
+    zipkin: null
+    filelog:
+      retry_on_failure:
+        enabled: true
+      start_at: end
+      exclude:
+      # exlude collector logs
+      - /var/log/pods/*/opentelemetry-collector/*.log
+      include:
+      - /var/log/pods/*/*/*.log
+      include_file_name: false
+      include_file_path: true
+      operators:
+      - id: container-parser
+        type: container
+    hostmetrics:
+      collection_interval: 10s
+      root_path: /hostfs
+      scrapers:
+        cpu:
+          metrics:
+            system.cpu.utilization:
+              enabled: true
+            system.cpu.logical.count:
+              enabled: true
+        memory:
+          metrics:
+            system.memory.utilization:
+              enabled: true
+        process:
+          mute_process_exe_error: true
+          mute_process_io_error: true
+          mute_process_user_error: true
+          metrics:
+            process.threads:
+              enabled: true
+            process.open_file_descriptors:
+              enabled: true
+            process.memory.utilization:
+              enabled: true
+            process.disk.operations:
+              enabled: true
+        network:
+        processes:
+        load:
+        disk:
+        filesystem:
+          exclude_mount_points:
+            mount_points:
+              - /dev/*
+              - /proc/*
+              - /sys/*
+              - /run/k3s/containerd/*
+              - /var/lib/docker/*
+              - /var/lib/kubelet/*
+              - /snap/*
+            match_type: regexp
+          exclude_fs_types:
+            fs_types:
+              - autofs
+              - binfmt_misc
+              - bpf
+              - cgroup2
+              - configfs
+              - debugfs
+              - devpts
+              - devtmpfs
+              - fusectl
+              - hugetlbfs
+              - iso9660
+              - mqueue
+              - nsfs
+              - overlay
+              - proc
+              - procfs
+              - pstore
+              - rpc_pipefs
+              - securityfs
+              - selinuxfs
+              - squashfs
+              - sysfs
+              - tracefs
+            match_type: strict
+    kubeletstats:
+      auth_type: serviceAccount
+      collection_interval: 20s
+      endpoint: ${env:K8S_NODE_NAME}:10250
+      node: '${env:K8S_NODE_NAME}'
+      # Required to work for all CSPs without an issue
+      insecure_skip_verify: true
+      k8s_api_config:
+        auth_type: serviceAccount
+      metrics:
+        k8s.pod.memory.node.utilization:
+          enabled: true
+        k8s.pod.cpu.node.utilization:
+          enabled: true
+        k8s.container.cpu_limit_utilization:
+          enabled: true
+        k8s.pod.cpu_limit_utilization:
+          enabled: true
+        k8s.container.cpu_request_utilization:
+          enabled: true
+        k8s.container.memory_limit_utilization:
+          enabled: true
+        k8s.pod.memory_limit_utilization:
+          enabled: true
+        k8s.container.memory_request_utilization:
+          enabled: true
+        k8s.node.uptime:
+          enabled: true
+        k8s.node.cpu.usage:
+          enabled: true
+        k8s.pod.cpu.usage:
+          enabled: true
+      extra_metadata_labels:
+        - container.id
+  service:
+    extensions: [health_check]
+    pipelines:
+      logs:
+        receivers: [filelog]
+        processors: [batch, k8sattributes, resourcedetection/system, resourcedetection/eks, resourcedetection/gcp, resource/demo, resource/k8s, resource/cloud, attributes/k8s_logs_dataset]
+        exporters: [debug, elasticsearch]
+      metrics:
+        receivers: [hostmetrics, kubeletstats]
+        processors: [batch, k8sattributes, elasticinframetrics, resourcedetection/system, resource/demo, resourcedetection/eks, resourcedetection/gcp, resource/k8s, resource/cloud, attributes/dataset, resource/process]
+        exporters: [debug, elasticsearch]
+      traces: null
+    telemetry:
+      metrics:
+        address: ${env:MY_POD_IP}:8888
diff --git a/kubernetes/elastic-helm/deployment.yaml b/kubernetes/elastic-helm/deployment.yaml
index 645d2c9206..7c0867cd44 100644
--- a/kubernetes/elastic-helm/deployment.yaml
+++ b/kubernetes/elastic-helm/deployment.yaml
@@ -1,7 +1,7 @@
 default:
   image:
     repository: ghcr.io/elastic/opentelemetry-demo
-    tag: 1.11.3
+    tag: 1.11.4
   envOverrides:
     - name: OTEL_SERVICE_NAME
       valueFrom:
@@ -59,9 +59,78 @@ opentelemetry-collector:
           name: elastic-secret
           key: elastic_apm_secret_token
 
-  configMap:
-    create: false
-    existingName: elastic-otelcol-agent
+  alternateConfig:
+    extensions:
+      health_check:
+        endpoint: ${env:MY_POD_IP}:13133
+    connectors:
+      spanmetrics: {}
+    exporters:
+      debug: {}
+      otlp/elastic:
+        endpoint: ${env:ELASTIC_APM_ENDPOINT}
+        compression: none
+        headers:
+          Authorization: Bearer ${env:ELASTIC_APM_SECRET_TOKEN}
+    processors:
+      batch: {}
+      resource:
+        attributes:
+          - key: deployment.environment
+            value: "opentelemetry-demo"
+            action: upsert
+    receivers:
+      httpcheck/frontendproxy:
+        targets:
+        - endpoint: http://example-frontendproxy:8080
+      otlp:
+        protocols:
+          grpc:
+            endpoint: ${env:MY_POD_IP}:4317
+          http:
+            cors:
+              allowed_origins:
+              - http://*
+              - https://*
+            endpoint: ${env:MY_POD_IP}:4318
+    service:
+      extensions:
+        - health_check
+      pipelines:
+        logs:
+          exporters:
+          - debug
+          - otlp/elastic
+          processors:
+          - batch
+          - resource
+          receivers:
+          - otlp
+        metrics:
+          exporters:
+          - otlp/elastic
+          - debug
+          processors:
+          - batch
+          - resource
+          receivers:
+          - httpcheck/frontendproxy
+          - otlp
+          - spanmetrics
+        traces:
+          exporters:
+          - otlp/elastic
+          - debug
+          - spanmetrics
+          processors:
+          - batch
+          - resource
+          receivers:
+          - otlp
+      telemetry:
+        metrics:
+          address: ${env:MY_POD_IP}:8888
+
 
 opensearch:
   enabled: false