diff --git a/tools/ci.yml b/tools/ci.yml
index 73eb7112..c002fcb8 100644
--- a/tools/ci.yml
+++ b/tools/ci.yml
@@ -7,7 +7,8 @@ services:
     environment:
       - SERVER=http://nginx:8851
       - INITIAL_DELAY=20
-    entrypoint: /bin/sh -c "dockerize -wait tcp://nginx:8851/v1/status -timeout 1m python -m pytest -n 16 entityservice/tests --junitxml=testResults.xml -x"
+      - JAEGER_AGENT_HOST=jaeger
+    command: /bin/sh -c "dockerize -wait tcp://nginx:8851/v1/status -timeout 1m python -m pytest -n 4 entityservice/tests --junitxml=testResults.xml -x"
     depends_on:
       - db
       - redis
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index eb977d19..639c9172 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -35,6 +35,7 @@ services:
       - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
       - FLASK_DB_MIN_CONNECTIONS=1
       - FLASK_DB_MAX_CONNECTIONS=10
+      - JAEGER_AGENT_HOST=jaeger
     depends_on:
       - db
       - db_init
@@ -73,6 +74,7 @@ services:
       #- CHUNK_SIZE_AIM=300_000_000
       - CELERY_DB_MIN_CONNECTIONS=1
       - CELERY_DB_MAX_CONNECTIONS=3
+      - JAEGER_AGENT_HOST=jaeger
 
 
   nginx: