diff --git a/.github/docker/ddsenabler/Dockerfile b/.github/docker/ddsenabler/Dockerfile
index 582e2f35..67127094 100644
--- a/.github/docker/ddsenabler/Dockerfile
+++ b/.github/docker/ddsenabler/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL author=raul@eprosima.com
 
 # Avoid interactuation with installation of some package that needs the locale.
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
     libyaml-cpp-dev
 
 # Install required python modules
-RUN pip3 install \
+RUN pip3 install --break-system-packages \
         colcon-common-extensions \
         colcon-mixin \
         lxml \
diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml
index c9813d99..5dfb7e3c 100644
--- a/.github/workflows/docker-reusable-workflow.yml
+++ b/.github/workflows/docker-reusable-workflow.yml
@@ -54,7 +54,7 @@ env:
 jobs:
   docker-test:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE: "ddsenabler:ci"
@@ -101,7 +101,7 @@ jobs:
       - name: Download dependencies and install requirements
         uses: ./src/.github/actions/project_dependencies
         with:
-          os: ubuntu-22.04
+          os: ubuntu-24.04
           cmake_build_type: "Release"
           dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }}
           secret_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/ddsenabler_test/compose/scripts/execute_and_validate_listener.py b/ddsenabler_test/compose/scripts/execute_and_validate_listener.py
index 5a628bf6..df4f48c7 100644
--- a/ddsenabler_test/compose/scripts/execute_and_validate_listener.py
+++ b/ddsenabler_test/compose/scripts/execute_and_validate_listener.py
@@ -16,6 +16,8 @@
 
 import log
 
+import os
+
 import validation
 
 DESCRIPTION = """Script to validate listeners output"""
@@ -78,7 +80,7 @@ def _listener_command(args):
     """
     command = [
         'python3',
-        '/opt/ros/jazzy/lib/demo_nodes_py/listener']
+        f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/listener']
 
     return command
 
diff --git a/ddsenabler_test/compose/scripts/execute_and_validate_talker.py b/ddsenabler_test/compose/scripts/execute_and_validate_talker.py
index 7ef698af..0d1466f1 100644
--- a/ddsenabler_test/compose/scripts/execute_and_validate_talker.py
+++ b/ddsenabler_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/jazzy/lib/demo_nodes_py/talker']
+        f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/talker']
 
     return command