diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5804315..c607c89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ variables:
   DOCKER_DRIVER: overlay2
   PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
   base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base
+  distro: foxy
 
 .global_artifacts: &global_artifacts
   artifacts:
@@ -19,7 +20,7 @@ before_script:
   - . /root/ws/install/local_setup.sh
 
 tracing_enabled:
-  image: $base_image_id
+  image: $base_image_id:$distro
   script:
     - lttng-sessiond --daemonize
     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
@@ -30,7 +31,7 @@ tracing_enabled:
   <<: *global_artifacts
 
 tracing_disabled:
-  image: $base_image_id
+  image: $base_image_id:$distro
   script:
     - colcon build --symlink-install --cmake-args " -DTRACETOOLS_DISABLED=ON" --packages-up-to $PACKAGES_LIST
     - . install/local_setup.sh
@@ -40,7 +41,7 @@ tracing_disabled:
   <<: *global_artifacts
 
 no_lttng:
-  image: $base_image_id:base
+  image: $base_image_id:$distro-base
   script:
     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
     - . install/local_setup.sh