diff --git a/java-instrumentation/docker-compose.yml b/java-instrumentation/docker-compose.yml
index 9280a83..6e198fd 100644
--- a/java-instrumentation/docker-compose.yml
+++ b/java-instrumentation/docker-compose.yml
@@ -97,6 +97,8 @@ services:
         condition: service_healthy
       validation-service:
         condition: service_started
+      otel-collector:
+        condition: service_started  
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/todo
diff --git a/java-instrumentation/kubernetes/collector/values.yaml b/java-instrumentation/kubernetes/collector/values.yaml
index 0317dcf..e79912f 100644
--- a/java-instrumentation/kubernetes/collector/values.yaml
+++ b/java-instrumentation/kubernetes/collector/values.yaml
@@ -16,7 +16,7 @@ extraEnvs:
     value: admin
   - name: OPENSEARCH_PASSWORD
     value: SecureP@ssw0rd123
-  - name: DASH0_AUTHORIZATION_TOKEN
+  - name: DASH0_AUTH_TOKEN
     valueFrom:
       secretKeyRef:
         name: dash0-secrets
@@ -85,7 +85,7 @@ config:
 
     bearertokenauth/dash0:
       scheme: Bearer
-      token: ${env:DASH0_AUTHORIZATION_TOKEN}
+      token: ${env:DASH0_AUTH_TOKEN}
 
   service:
     extensions:
diff --git a/java-instrumentation/otel-collector-config.yaml b/java-instrumentation/otel-collector-config.yaml
index c7e3430..cff4be1 100644
--- a/java-instrumentation/otel-collector-config.yaml
+++ b/java-instrumentation/otel-collector-config.yaml
@@ -2,7 +2,9 @@ receivers:
   otlp:
     protocols:
       grpc:
-      http:
+        endpoint: 0.0.0.0:4317
+      http: 
+        endpoint: 0.0.0.0:4318
 
 processors:
   batch:
@@ -15,7 +17,7 @@ extensions:
 
   bearertokenauth/dash0:
     scheme: Bearer
-    token: ${env:DASH0_AUTHORIZATION_TOKEN}
+    token: ${env:DASH0_AUTH_TOKEN}
 
 exporters:
   prometheus:
diff --git a/java-instrumentation/todo-service/Dockerfile b/java-instrumentation/todo-service/Dockerfile
index c654d80..e2a4dc2 100644
--- a/java-instrumentation/todo-service/Dockerfile
+++ b/java-instrumentation/todo-service/Dockerfile
@@ -1,9 +1,11 @@
 # Use an official OpenJDK image
-FROM eclipse-temurin:17-jdk
+FROM azul/zulu-openjdk:17-latest
 
 # Set the working directory inside the container
 WORKDIR /app
 
+RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
+
 # Download OpenTelemetry Java agent
 RUN curl -L -o opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
 
diff --git a/java-instrumentation/validation-service/Dockerfile b/java-instrumentation/validation-service/Dockerfile
index 9368c6c..1f61004 100644
--- a/java-instrumentation/validation-service/Dockerfile
+++ b/java-instrumentation/validation-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim
+FROM azul/zulu-openjdk:17-latest
 
 WORKDIR /app