diff --git a/.github/docker/vulcanexus/Dockerfile b/.github/docker/vulcanexus/Dockerfile
index 60fc91ca3..f5f709d64 100644
--- a/.github/docker/vulcanexus/Dockerfile
+++ b/.github/docker/vulcanexus/Dockerfile
@@ -20,10 +20,9 @@ RUN echo "Docker Base image used: ${docker_image_base}"
 RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \
         apt-get update && \
         apt-get install -y \
-            ros-humble-example-interfaces \
-            ros-humble-example-interfaces \
-            ros-humble-demo-nodes-cpp \
-            ros-humble-demo-nodes-py
+            ros-$VULCANEXUS_DISTRO-example-interfaces \
+            ros-$VULCANEXUS_DISTRO-demo-nodes-cpp \
+            ros-$VULCANEXUS_DISTRO-demo-nodes-py
 
 # Copy and use run.bash as entrypoint
 COPY run.bash /root/run.bash
diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml
index 2a521878c..8b8e351ac 100644
--- a/.github/workflows/docker-reusable-workflow.yml
+++ b/.github/workflows/docker-reusable-workflow.yml
@@ -72,7 +72,7 @@ jobs:
           cd ./src/.github/docker/vulcanexus
           docker build \
             --no-cache \
-            --build-arg docker_image_base=eprosima/vulcanexus:humble-core \
+            --build-arg docker_image_base=eprosima/vulcanexus:jazzy-core \
             -t ${{ env.DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE }} \
             -f Dockerfile .
 
diff --git a/ddsrouter_test/compose/scripts/execute_and_validate_listener.py b/ddsrouter_test/compose/scripts/execute_and_validate_listener.py
index 035228cd8..44c98268c 100644
--- a/ddsrouter_test/compose/scripts/execute_and_validate_listener.py
+++ b/ddsrouter_test/compose/scripts/execute_and_validate_listener.py
@@ -16,6 +16,8 @@
 
 import log
 
+import os
+
 import validation
 
 DESCRIPTION = """Script to validate listeners output"""
@@ -72,7 +74,7 @@ def _listener_command(args):
     """
     command = [
         'python3',
-        '/opt/ros/humble/lib/demo_nodes_py/listener']
+        f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/listener']
 
     return command
 
diff --git a/ddsrouter_test/compose/scripts/execute_and_validate_talker.py b/ddsrouter_test/compose/scripts/execute_and_validate_talker.py
index 61f75efe0..bda9cab47 100644
--- a/ddsrouter_test/compose/scripts/execute_and_validate_talker.py
+++ b/ddsrouter_test/compose/scripts/execute_and_validate_talker.py
@@ -16,6 +16,8 @@
 
 import log
 
+import os
+
 import validation
 
 DESCRIPTION = """Script to validate talkers output"""
@@ -67,7 +69,7 @@ def _talker_command(args):
     """
     command = [
         'python3',
-        '/opt/ros/humble/lib/demo_nodes_py/talker']
+        f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/talker']
 
     return command