diff --git a/.env.override b/.env.override
index d6c9713d51..23837520d1 100644
--- a/.env.override
+++ b/.env.override
@@ -15,6 +15,7 @@ KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile.elastic
 # *********************
 # Elastic Collector
 # *********************
-COLLECTOR_CONTRIB_IMAGE=docker.elastic.co/beats/elastic-agent:8.15.0-SNAPSHOT
+COLLECTOR_CONTRIB_IMAGE=docker.elastic.co/beats/elastic-agent:8.16.0-SNAPSHOT
 OTEL_COLLECTOR_CONFIG=./src/otelcollector/otelcol-elastic-config.yaml
 OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otelcollector/otelcol-elastic-config-extras.yaml
+ELASTIC_AGENT_OTEL=true
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index ac84270a06..5b463be07c 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -583,8 +583,7 @@ services:
         limits:
           memory: 200M
     restart: unless-stopped
-    command: ["otel", "--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
-    entrypoint: [ /usr/share/elastic-agent/elastic-agent ]
+    command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
     user: 0:0
     volumes:
       - ${HOST_FILESYSTEM}:/hostfs:ro
@@ -603,6 +602,7 @@ services:
       - OTEL_COLLECTOR_HOST
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
+      - ELASTIC_AGENT_OTEL
 
   # Prometheus
   prometheus:
diff --git a/docker-compose.yml b/docker-compose.yml
index 4605ee2dab..98789cf030 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -693,8 +693,7 @@ services:
         limits:
           memory: 200M
     restart: unless-stopped
-    command: ["otel", "--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
-    entrypoint: [ /usr/share/elastic-agent/elastic-agent ]
+    command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
     user: 0:0
     volumes:
       - ${HOST_FILESYSTEM}:/hostfs:ro
@@ -713,6 +712,7 @@ services:
       - OTEL_COLLECTOR_HOST
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
+      - ELASTIC_AGENT_OTEL
 
   # Prometheus
   prometheus: