diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5f6777..e047245 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,12 +8,18 @@ variables:
 services:
   - docker:dind
 
+before_script:
+  - vcs import < instrumentation.repos
+
 build_enabled:
   image: $base_image_id
   script:
     - lttng-sessiond --daemonize
-    - . install/local_setup.sh && colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
-    - . install/local_setup.sh && colcon test --packages-select $PACKAGES_LIST
+    - . /root/ws/install/local_setup.sh
+    - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
+    - . install/local_setup.sh
+    - colcon test --packages-select $PACKAGES_LIST
+    - colcon test-result
   artifacts:
     paths:
       - install
diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile
index 3ee6fd8..23f233f 100644
--- a/docker-ci-base/Dockerfile
+++ b/docker-ci-base/Dockerfile
@@ -3,17 +3,16 @@ FROM ros:dashing-ros-base-bionic
 RUN apt-get update
 
 RUN apt-get install --no-install-recommends -y \
-    libasio-dev \
-    libtinyxml2-dev
-
-RUN apt-get install -y software-properties-common
+    software-properties-common
 RUN apt-add-repository -y ppa:lttng/ppa
 RUN apt-get update
+
 RUN apt-get install --no-install-recommends -y \
+    libasio-dev \
+    libtinyxml2-dev \
     lttng-tools \
     lttng-modules-dkms \
-    liblttng-ust-dev
-RUN apt-get install --no-install-recommends -y \
+    liblttng-ust-dev \
     python3-lttng \
     python3-babeltrace
 
@@ -24,8 +23,8 @@ RUN apt-get install --no-install-recommends -y \
 RUN mkdir /root/ws
 COPY . /root/ws
 WORKDIR /root/ws
-RUN vcs import < instrumentation.repos && vcs import < ci_source_deps.repos
+RUN vcs import < ci_source_deps.repos
 RUN apt-get update && rosdep update && rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
 RUN apt-get purge -y ros-dashing-fastrtps
 
-RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
+RUN . /opt/ros/dashing/setup.sh && colcon build --symlink-install