diff --git a/.github/docker/vulcanexus/Dockerfile b/.github/docker/vulcanexus/Dockerfile
index f5f709d64..60a43b673 100644
--- a/.github/docker/vulcanexus/Dockerfile
+++ b/.github/docker/vulcanexus/Dockerfile
@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # Avoids using interactions during building
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Use a bash shell so it is possigle to run things like `source` (required for colcon builds)
+# Use a bash shell so it is possible to run things like `source` (required for colcon builds)
 SHELL ["/bin/bash", "-c"]
 
 ARG docker_image_base
diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml
index d43bf0041..470d61aec 100644
--- a/.github/workflows/docker-reusable-workflow.yml
+++ b/.github/workflows/docker-reusable-workflow.yml
@@ -136,7 +136,7 @@ jobs:
             --return-code-on-test-failure \
             --ctest-args \
               --label-regex xfail \
-              --timeout 120
+              --timeout 240
 
       - name: Run tests
         run: |
@@ -149,4 +149,4 @@ jobs:
             --return-code-on-test-failure \
             --ctest-args \
               --label-exclude xfail \
-              --timeout 120
+              --timeout 240
diff --git a/ddsrouter_test/compose/docker-compose.sh b/ddsrouter_test/compose/docker-compose.sh
index 90359607e..a01f36699 100755
--- a/ddsrouter_test/compose/docker-compose.sh
+++ b/ddsrouter_test/compose/docker-compose.sh
@@ -120,8 +120,7 @@ main ()
     echo "${TEST_NAME} exited with code ${EXIT_CODE}"
 
     # Clean containers and networks before exiting and do not prompt for confirmation
-    docker container prune --force
-    docker network prune --force
+    docker compose -f ${COMPOSE_FILE} down --remove-orphans --timeout 20
 
     exit ${EXIT_CODE}
 }
diff --git a/ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml b/ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml
index f456379b9..b6c557ba7 100644
--- a/ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml
+++ b/ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml
@@ -41,7 +41,7 @@ services:
       - cloud_edge_net
     volumes:
       - ./ddsrouter_cloud.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -53,7 +53,7 @@ services:
       - edge_1_net
     volumes:
       - ./ddsrouter_edge_1.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
   pub_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -62,7 +62,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 110 -d 1
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 110 -d 1 --reliable
 
   sub_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
       - edge_1_net
     volumes:
       - ../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 1 --samples 20"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 60 --args "--domain 1 --samples 20 --reliable"
 
   ddsrouter_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -85,7 +85,7 @@ services:
       - edge_2_net
     volumes:
       - ./ddsrouter_edge_2.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
   sub_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -96,7 +96,7 @@ services:
       - edge_2_net
     volumes:
       - ../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 2 --samples 20"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 60 --args "--domain 2 --samples 20 --reliable"
 
 networks:
   edge_1_net:
diff --git a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml
index 285a21ed3..77191c0cd 100644
--- a/ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml
+++ b/ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml
@@ -62,7 +62,7 @@ services:
       - cloud_edge_net
     volumes:
       - ./ddsrouter_cloud_1.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 15
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_cloud_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
       - cloud_edge_net
     volumes:
       - ./ddsrouter_cloud_2.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 15
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -85,7 +85,7 @@ services:
       - edge_1_net
     volumes:
       - ./ddsrouter_edge_1.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 15
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -97,7 +97,7 @@ services:
       - edge_2_net
     volumes:
       - ./ddsrouter_edge_2.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 15
+    command: ddsrouter -c /config.yaml --timeout 60
 
  # SUBSCRIBERS
   subscriber_reliable:
@@ -109,7 +109,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 15 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable --transient-local --keep-all"
 
   subscriber_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -120,7 +120,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1 --keep-last 10"
 
   subscriber_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -131,7 +131,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2 --keep-last 10"
 
 
   subscriber_3:
@@ -143,7 +143,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3 --keep-last 10"
 
   # PUBLISHERS
   publisher_reliable:
@@ -153,7 +153,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --wait 1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --transient-local --keep-all --wait 1
 
   publisher_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -162,7 +162,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
 
   publisher_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -171,7 +171,7 @@ services:
       - ddsrouter_edge_1
     networks:
      - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
 
   publisher_3:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -180,7 +180,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
 
   publisher_4:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -189,7 +189,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
 
   publisher_5:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -198,7 +198,7 @@ services:
       - ddsrouter_edge_1
     networks:
      - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
 
   publisher_6:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -207,7 +207,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
 
   publisher_7:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -216,7 +216,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
 
   publisher_8:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -225,7 +225,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
 
   publisher_9:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -234,7 +234,7 @@ services:
       - ddsrouter_edge_1
     networks:
      - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
 
   publisher_10:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -243,7 +243,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
 
   publisher_11:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -252,7 +252,7 @@ services:
       - ddsrouter_edge_1
     networks:
      - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
 
   publisher_12:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -261,7 +261,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
 
 
 networks:
diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/compose.yml b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/compose.yml
index a96e2404b..f79a02c71 100644
--- a/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/compose.yml
+++ b/ddsrouter_test/compose/test_cases/stress/repeater/mixed_data_sizes/compose.yml
@@ -66,7 +66,7 @@ services:
           - ddsrouter_cloud.edge_cloud
     volumes:
       - ./ddsrouter_cloud.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   # PUBLISHER 1
 
@@ -80,7 +80,7 @@ services:
       - edge_01_net
     volumes:
       - ./ddsrouter_edge_01.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_01:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -89,7 +89,7 @@ services:
       - ddsrouter_edge_01
     networks:
       - edge_01_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 101 --name topic_0 -m 1 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 101 --name topic_0 -m 1 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 1
 
@@ -103,7 +103,7 @@ services:
       - edge_11_net
     volumes:
       - ./ddsrouter_edge_11.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_11:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -114,7 +114,7 @@ services:
       - edge_11_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 111 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 111 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 2
 
@@ -128,7 +128,7 @@ services:
       - edge_02_net
     volumes:
       - ./ddsrouter_edge_02.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_02:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -137,7 +137,7 @@ services:
       - ddsrouter_edge_02
     networks:
       - edge_02_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 102 --name topic_0 -m 12 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 102 --name topic_0 -m 12 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 2
 
@@ -151,7 +151,7 @@ services:
       - edge_12_net
     volumes:
       - ./ddsrouter_edge_12.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_12:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -162,7 +162,7 @@ services:
       - edge_12_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 112 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 112 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 3
 
@@ -176,7 +176,7 @@ services:
       - edge_03_net
     volumes:
       - ./ddsrouter_edge_03.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_03:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -185,7 +185,7 @@ services:
       - ddsrouter_edge_03
     networks:
       - edge_03_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 103 --name topic_0 -m 123 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 103 --name topic_0 -m 123 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 3
 
@@ -199,7 +199,7 @@ services:
       - edge_13_net
     volumes:
       - ./ddsrouter_edge_13.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_13:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -210,7 +210,7 @@ services:
       - edge_13_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 113 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 113 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 4
 
@@ -224,7 +224,7 @@ services:
       - edge_04_net
     volumes:
       - ./ddsrouter_edge_04.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_04:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -233,7 +233,7 @@ services:
       - ddsrouter_edge_04
     networks:
       - edge_04_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 104 --name topic_0 -m 1234 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 104 --name topic_0 -m 1234 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 4
 
@@ -247,7 +247,7 @@ services:
       - edge_14_net
     volumes:
       - ./ddsrouter_edge_14.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_14:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -258,7 +258,7 @@ services:
       - edge_14_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 114 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 114 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 5
 
@@ -272,7 +272,7 @@ services:
       - edge_05_net
     volumes:
       - ./ddsrouter_edge_05.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_05:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -281,7 +281,7 @@ services:
       - ddsrouter_edge_05
     networks:
       - edge_05_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 105 --name topic_0 -m 12345 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 105 --name topic_0 -m 12345 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 5
 
@@ -295,7 +295,7 @@ services:
       - edge_15_net
     volumes:
       - ./ddsrouter_edge_15.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_15:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -306,7 +306,7 @@ services:
       - edge_15_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 115 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 115 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 6
 
@@ -320,7 +320,7 @@ services:
       - edge_06_net
     volumes:
       - ./ddsrouter_edge_06.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_06:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -329,7 +329,7 @@ services:
       - ddsrouter_edge_06
     networks:
       - edge_06_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 106 --name topic_0 -m 123456 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 106 --name topic_0 -m 123456 --transport UDPv4 -r --keep-last 21 --wait 1
 
   # SUBSCRIBER 6
 
@@ -343,7 +343,7 @@ services:
       - edge_16_net
     volumes:
       - ./ddsrouter_edge_16.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_16:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -354,7 +354,7 @@ services:
       - edge_16_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 116 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 116 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
   # PUBLISHER 7
 
@@ -368,7 +368,7 @@ services:
       - edge_07_net
     volumes:
       - ./ddsrouter_edge_07.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   publisher_07:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -377,7 +377,7 @@ services:
       - ddsrouter_edge_07
     networks:
       - edge_07_net
-    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 106 --name topic_0 -m 1234567 --transport UDPv4 -r
+    command: build/fastdds_configuration_example/configuration publisher -i 100 -s 80 -d 107 --name topic_0 -m 1234567 --transport UDPv4 -r --keep-last 5 --wait 1
 
   # SUBSCRIBER 7
 
@@ -391,7 +391,7 @@ services:
       - edge_17_net
     volumes:
       - ./ddsrouter_edge_17.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml  --timeout 30
+    command: ddsrouter -c /config.yaml  --timeout 60
 
   subscriber_17:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -402,7 +402,7 @@ services:
       - edge_17_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 30 --args "--samples 150 --domain 117 --name topic_0 --transport UDPv4 -r"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 150 --timeout 60 --args "--samples 150 --domain 117 --name topic_0 --transport UDPv4 -r --keep-last 21"
 
 networks:
   edge_01_net:
diff --git a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/compose.yml b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/compose.yml
index 4f7bebcc0..acda4819b 100644
--- a/ddsrouter_test/compose/test_cases/stress/repeater/reliable/compose.yml
+++ b/ddsrouter_test/compose/test_cases/stress/repeater/reliable/compose.yml
@@ -68,7 +68,7 @@ services:
             - ddsrouter_cloud.edge_2
     volumes:
       - ./ddsrouter_cloud.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -80,7 +80,7 @@ services:
       - edge_1_net
     volumes:
       - ./ddsrouter_edge_1.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
   ddsrouter_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -92,7 +92,7 @@ services:
       - edge_2_net
     volumes:
       - ./ddsrouter_edge_2.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 60
 
  # SUBSCRIBERS
   subscriber_reliable:
@@ -104,7 +104,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 15 --allow-duplicates -1 --delay 1 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --delay 1 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable --keep-all --transient-local"
 
   subscriber_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -115,7 +115,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1 --keep-last 10"
 
   subscriber_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -126,7 +126,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2 --keep-last 10"
 
 
   subscriber_3:
@@ -138,7 +138,7 @@ services:
       - edge_2_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3 --keep-last 10"
 
   # PUBLISHERS
   publisher_reliable:
@@ -148,7 +148,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --wait 1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --transient-local --keep-all --wait 1
 
   publisher_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -157,7 +157,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -166,7 +166,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_3:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -175,7 +175,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_4:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -184,7 +184,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_5:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -193,7 +193,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_6:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -202,7 +202,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_7:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -211,7 +211,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_8:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -220,7 +220,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_9:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -229,7 +229,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_10:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -238,7 +238,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_11:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -247,7 +247,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_12:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -256,7 +256,7 @@ services:
       - ddsrouter_edge_1
     networks:
       - edge_1_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
 networks:
   edge_1_net:
diff --git a/ddsrouter_test/compose/test_cases/stress/simple/reliable/compose.yml b/ddsrouter_test/compose/test_cases/stress/simple/reliable/compose.yml
index 4b5692d1d..f9376d3e5 100644
--- a/ddsrouter_test/compose/test_cases/stress/simple/reliable/compose.yml
+++ b/ddsrouter_test/compose/test_cases/stress/simple/reliable/compose.yml
@@ -48,7 +48,7 @@ services:
       - std_net
     volumes:
       - ./ddsrouter.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 15
+    command: ddsrouter -c /config.yaml --timeout 60
 
 
  # SUBSCRIBERS
@@ -59,7 +59,7 @@ services:
       - std_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 15 --delay 1 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --delay 1 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable --transient-local --keep-all"
 
   subscriber_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -68,7 +68,7 @@ services:
       - std_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1 --keep-last 10"
 
   subscriber_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -77,7 +77,7 @@ services:
       - std_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2 --keep-last 10"
 
   subscriber_3:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -86,7 +86,7 @@ services:
       - std_net
     volumes:
       - ../../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3 --keep-last 10"
 
   # PUBLISHERS
   publisher_reliable:
@@ -94,7 +94,7 @@ services:
     container_name: publisher_reliable
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --wait 1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --transient-local --keep-all --wait 1
 
   publisher_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -108,77 +108,77 @@ services:
     container_name: publisher_2
     networks:
      - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_3:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_3
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_4:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_4
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1 --keep-last 10
 
   publisher_5:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_5
     networks:
      - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_6:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_6
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_7:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_7
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_8:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_8
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2 --keep-last 10
 
   publisher_9:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_9
     networks:
      - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_10:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_10
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_11:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_11
     networks:
      - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
   publisher_12:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
     container_name: publisher_12
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3 --keep-last 10
 
 
 networks:
diff --git a/ddsrouter_test/compose/test_cases/tcp/compose.yml b/ddsrouter_test/compose/test_cases/tcp/compose.yml
index 544d73269..a6f9f5b60 100644
--- a/ddsrouter_test/compose/test_cases/tcp/compose.yml
+++ b/ddsrouter_test/compose/test_cases/tcp/compose.yml
@@ -40,7 +40,7 @@ services:
       - cloud_edge_net
     volumes:
       - ./ddsrouter_cloud.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 30
 
   ddsrouter_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -52,7 +52,7 @@ services:
       - edge_1_net
     volumes:
       - ./ddsrouter_edge_1.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 30
 
   pub_edge_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -72,7 +72,7 @@ services:
       - edge_1_net
     volumes:
       - ../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 1 --samples 20"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 30 --args "--domain 1 --samples 20"
 
   ddsrouter_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -84,7 +84,7 @@ services:
       - edge_2_net
     volumes:
       - ./ddsrouter_edge_2.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 30
 
   sub_edge_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -95,7 +95,7 @@ services:
       - edge_2_net
     volumes:
       - ../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 2 --samples 20"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 30 --args "--domain 2 --samples 20"
 
 networks:
   edge_1_net:
diff --git a/ddsrouter_test/compose/test_cases/transparency/partitions/compose.yml b/ddsrouter_test/compose/test_cases/transparency/partitions/compose.yml
index 8ca092a39..3766ec6e6 100644
--- a/ddsrouter_test/compose/test_cases/transparency/partitions/compose.yml
+++ b/ddsrouter_test/compose/test_cases/transparency/partitions/compose.yml
@@ -24,7 +24,7 @@ services:
       - std_net
     volumes:
       - ./ddsrouter.yaml:/config.yaml
-    command: ddsrouter -c /config.yaml --timeout 12
+    command: ddsrouter -c /config.yaml --timeout 20
 
   # DOMAIN 0
   publisher_0_0:
@@ -34,7 +34,7 @@ services:
       - ddsrouter
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 0 --partition "A"
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 0 --partition "A" --keep-last 20 --reliable
 
   subscriber_0_0:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -45,7 +45,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 0 --samples 20 --partition bbb"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --args "--domain 0 --samples 20 --partition bbb --keep-all --reliable"
 
   # DOMAIN 1
   publisher_1_0:
@@ -55,7 +55,7 @@ services:
       - ddsrouter
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 1 --partition "bbb;ccc"
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 1 --partition "bbb;ccc" --keep-last 20 --reliable
 
   publisher_1_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -64,7 +64,7 @@ services:
       - ddsrouter
     networks:
       - std_net
-    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 1 --name NonPartitionTopic
+    command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 110 --domain 1 --name NonPartitionTopic --keep-last 20 --reliable
 
   # DOMAIN 2
   subscriber_2_0:
@@ -76,7 +76,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 2 --samples 20 --partition A"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --args "--domain 2 --samples 20 --partition A --keep-all --reliable"
 
   subscriber_2_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -87,7 +87,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --allow-duplicates -1 --args "--domain 2 --samples 20 --partition bbb"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --allow-duplicates -1 --args "--domain 2 --samples 20 --partition bbb --keep-all --reliable"
 
   subscriber_2_2:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -98,7 +98,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 2 --samples 20 --partition ccc"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --args "--domain 2 --samples 20 --partition ccc --keep-all --reliable"
 
   # DOMAIN 3
   subscriber_3_0:
@@ -110,7 +110,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --allow-duplicates -1 --args "--domain 3 --samples 20 --partition *"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --allow-duplicates -1 --args "--domain 3 --samples 20 --partition * --keep-all --reliable"
 
   subscriber_3_1:
     image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -121,7 +121,7 @@ services:
       - std_net
     volumes:
       - ../../../scripts:/scripts
-    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 3 --samples 20 --name NonPartitionTopic"
+    command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 20 --args "--domain 3 --samples 20 --name NonPartitionTopic --keep-all --reliable"
 
 networks:
   std_net: