diff --git a/docker-compose.iot-agent.yml b/docker-compose.iot-agent.yml
index fe4aff9c..78b7b73d 100644
--- a/docker-compose.iot-agent.yml
+++ b/docker-compose.iot-agent.yml
@@ -27,12 +27,6 @@ services:
       - IOTA_PROVIDER_URL=http://smart-city-iot-agent-emqx:4041
       - IOTA_DEFAULT_RESOURCE=/
       - IOTA_DEFAULT_APIKEY=smartcity-emqx
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:4041/version || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.iot-agent-emqx.rule=Host(`iot-agent-emqx.digitribe.fr`)"
@@ -63,14 +57,8 @@ services:
       - IOTA_PROVIDER_URL=http://smart-city-iot-agent-mosquitto:4042
       - IOTA_DEFAULT_RESOURCE=/
       - IOTA_DEFAULT_APIKEY=smartcity-mosquitto
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:4042/version || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
 
-  # Instance 3: BunkerM
+  # Instance 3: BunkerM (Stellio NGSI-LD)
   iot-agent-bunkerm:
     image: fiware/iotagent-json:latest
     container_name: smart-city-iot-agent-bunkerm
@@ -80,10 +68,10 @@ services:
     ports:
       - "4043:4043"
     environment:
-      # Context Broker (Orion-LD)
-      - IOTA_CB_HOST=smart-city-orion-ld
-      - IOTA_CB_PORT=1026
-      - IOTA_CB_NGSI_VERSION=v2
+      # Context Broker (Stellio NGSI-LD)
+      - IOTA_CB_HOST=stellio-api-gateway
+      - IOTA_CB_PORT=8080
+      - IOTA_CB_NGSI_VERSION=ld
       # IoT Agent settings
       - IOTA_NORTH_PORT=4043
       - IOTA_REGISTRY_TYPE=memory
@@ -95,12 +83,6 @@ services:
       - IOTA_PROVIDER_URL=http://smart-city-iot-agent-bunkerm:4043
       - IOTA_DEFAULT_RESOURCE=/
       - IOTA_DEFAULT_APIKEY=smartcity-bunkerm
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:4043/version || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
 
 networks:
   smartcity-shared: