diff --git a/.env b/.env
index 162575c..42b2fa5 100644
--- a/.env
+++ b/.env
@@ -4,14 +4,14 @@ EXPOSED_PORT=1026
 
 # Orion variables
 ORION_LD_PORT=1026
-ORION_LD_VERSION=1.6.0
+ORION_LD_VERSION=1.8.0
 
 # Scorpio variables
 SCORPIO_PORT=9090
-SCORPIO_VERSION=5.0.2
+SCORPIO_VERSION=5.0.5
 
 # Stellio variables
-STELLIO_DOCKER_TAG=2.17.0
+STELLIO_DOCKER_TAG=2.18.1
 STELLIO_PORT=8080
 STELLIO_TIMESCALE_POSTGIS=16-2.16.0-3.3
 
diff --git a/README.md b/README.md
index 5fdaa4b..4bd5b23 100644
--- a/README.md
+++ b/README.md
@@ -1149,4 +1149,4 @@ the other [tutorials in this series](https://ngsi-ld-tutorials.rtfd.io)
 
 ## License
 
-[MIT](LICENSE) © 2022-2024 FIWARE Foundation e.V.
+[MIT](LICENSE) © 2022-2025 FIWARE Foundation e.V.
diff --git a/docker-compose/stellio.yml b/docker-compose/stellio.yml
index 658650c..cc693bd 100644
--- a/docker-compose/stellio.yml
+++ b/docker-compose/stellio.yml
@@ -4,17 +4,19 @@ services:
     hostname: stellio
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-api-gateway:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-api-gateway:${STELLIO_DOCKER_TAG}
     environment:
       - SPRING_PROFILES_ACTIVE=docker
     ports:
-      - ${EXPOSED_PORT:-1026}:${STELLIO_PORT:-9090}
+      - "${EXPOSED_PORT}:${STELLIO_PORT}"
+    networks:
+      - default
 
   search-service:
     container_name: stellio-search-service
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-search-service:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-search-service:${STELLIO_DOCKER_TAG}
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_search
@@ -32,6 +34,8 @@ services:
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8083:8083
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -43,7 +47,7 @@ services:
     container_name: stellio-subscription-service
     labels:
       org.fiware: 'tutorial'
-    image: stellio/stellio-subscription-service:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-subscription-service:${STELLIO_DOCKER_TAG}    
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_subscription
@@ -61,6 +65,8 @@ services:
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8085:8084
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -71,10 +77,12 @@ services:
   kafka:
     labels:
       org.fiware: 'tutorial'
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: kafka
     ports:
       - 29092:29092
+    networks:
+      - default
     restart: always
     environment:
       KAFKA_BROKER_ID: 1
@@ -88,9 +96,7 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
-    volumes:
-      - ./stellio/kafka/update_run.sh:/tmp/update_run.sh
-    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+      CLUSTER_ID: NjExODZhMWVjMzllMTFlZm
 
 
   # Databases
@@ -98,7 +104,6 @@ services:
     labels:
       org.fiware: 'tutorial'
     image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS}
-
     hostname: postgres
     container_name: db-postgres
     environment:
@@ -109,6 +114,8 @@ services:
       - ACCEPT_TIMESCALE_TUNING=TRUE
     ports:
       - 5432:5432
+    networks:
+      - default
     volumes:
       - postgres-db:/var/lib/postgresql
     healthcheck:
@@ -117,6 +124,5 @@ services:
       timeout: 5s
       retries: 20
       start_period: 10s
-
 volumes:
   postgres-db: ~
diff --git a/docker-compose/stellio/kafka/update_run.sh b/docker-compose/stellio/kafka/update_run.sh
deleted file mode 100755
index 18de790..0000000
--- a/docker-compose/stellio/kafka/update_run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter
-sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure
-
-# Docker workaround: Ignore cub zk-ready
-sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure
-
-# KRaft required step: Format the storage directory with a new cluster ID
-echo "kafka-storage format --ignore-formatted -t $(kafka-storage random-uuid) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure
-