diff --git a/compose.tracing.yaml b/compose.tracing.yaml
index f712b3c..d111e22 100644
--- a/compose.tracing.yaml
+++ b/compose.tracing.yaml
@@ -3,6 +3,19 @@ services:
     depends_on:
       jaeger:
         condition: service_healthy
+    environment:
+      - OTEL_SERVICE_NAME=cds
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_TRACES_SAMPLER=parentbased_always_on
+      - OTEL_EXPORTER_OTLP_PROTOCOL=http_protobuf
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318
+
+  kds:
+    environment:
+      - OTEL_TRACES_EXPORTER=otlp
+      - OTEL_TRACES_SAMPLER=parentbased_always_off
+      - OTEL_EXPORTER_OTLP_PROTOCOL=http_protobuf
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318
 
   jaeger:
     image: jaegertracing/all-in-one:1.47
diff --git a/compose.yaml b/compose.yaml
index c3d1139..d44cc5d 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -43,14 +43,14 @@ services:
       - ./test/riak/user.conf:/etc/riak/user.conf:ro
 
   kds:
-    image: docker.io/rbkmoney/kds:2eba263c863a3137036480718a922394a7215375
+    image: ghcr.io/valitydev/kds:sha-f034482
     command: /opt/kds/bin/kds foreground
     volumes:
       - ./test/kds/sys.config:/opt/kds/releases/0.1.0/sys.config:ro
       - ./test/kds/ca.crt:/var/lib/kds/ca.crt:ro
       - ./test/kds/server.pem:/var/lib/kds/server.pem:ro
     healthcheck:
-      test: "curl http://localhost:8022/"
+      test: "/opt/kds/bin/kds ping"
       interval: 5s
       timeout: 1s
       retries: 20