diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 873d4e4..67a8296 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,9 @@
 variables:
   DOCKER_DRIVER: overlay2
   PACKAGES_LIST: tracetools_analysis ros2trace_analysis
-  base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ci_base
+  BASE_IMAGE_ID: registry.gitlab.com/micro-ros/ros_tracing/ci_base
+  DISTRO: foxy
+  ROS2TRACING_BRANCH: master
 
 .global_artifacts: &global_artifacts
   artifacts:
@@ -15,13 +17,12 @@ variables:
         - build/*/pytest.xml
 
 build:
-  image: $base_image_id
+  image: $BASE_IMAGE_ID:$DISTRO
   before_script:
-    - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git
+    - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git --branch $ROS2TRACING_BRANCH
     - . /root/ws/install/local_setup.sh
   script:
     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
-    - . install/local_setup.sh
     - colcon test --packages-select $PACKAGES_LIST --pytest-args -o addopts=
     - colcon test-result --all
   <<: *global_artifacts