diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f2585c..9425d69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,37 +2,35 @@ image: ros:dashing-ros-base-bionic
 
 variables:
   DOCKER_DRIVER: overlay2
-  GIT_CLONE_PATH: $CI_BUILDS_DIR/src/$CI_PROJECT_NAME/
+  PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
 
 before_script:
-  - cd $CI_BUILDS_DIR
+  - vcs import < instrumentation.repos
+  - vcs import < ci_source_deps.repos
   - apt-get update
-  - apt-get install wget
-  - wget -q https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos
-  - vcs import src < ros2.repos
-  - rm -rf src/ros2/rcl/ src/ros2/rclcpp/
-  - git clone -b instrumentation --single-branch https://$DEPLOY_USERNAME_RCL:$DEPLOY_TOKEN_RCL@gitlab.com/boschresearch/ros-wg/tracing/rcl.git
-  - git clone -b instrumentation --single-branch https://$DEPLOY_USERNAME_RCLCPP:$DEPLOY_TOKEN_RCLCPP@gitlab.com/boschresearch/ros-wg/tracing/rclcpp.git
   - apt-get install --no-install-recommends -y libasio-dev libtinyxml2-dev
   - rosdep update
-  - rosdep install --from-paths src --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
+  - export RTI_NC_LICENSE_ACCEPTED=yes
+  - 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"
+
+# build:
+#   script:
+#     - colcon build --symlink-install --packages-up-to $PACKAGES_LIST
+#     - colcon test --packages-select $PACKAGES_LIST
+#   artifacts:
+#     paths:
+#       - install
+#       - build/*/test_results/*/*.xunit.xml
+#     reports:
+#       junit: build/*/Testing/*/Test.xml
 
-build:
-  script:
-    - colcon build --symlink-install --packages-up-to tracetools tracetools_test
-    - colcon test --packages-select tracetools tracetools_test
-  artifacts:
-    paths:
-      - install
-    reports:
-      junit: build/*/Testing/*/Test.xml
-      
 build_enabled:
   script:
-    - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to tracetools tracetools_test
-    - colcon test --packages-select tracetools tracetools_test
+    - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
+    - colcon test --packages-select $PACKAGES_LIST
   artifacts:
     paths:
       - install
+      - build/*/test_results/*/*.xunit.xml
     reports:
       junit: build/*/Testing/*/Test.xml
diff --git a/ci_source_deps.repos b/ci_source_deps.repos
new file mode 100644
index 0000000..e087a48
--- /dev/null
+++ b/ci_source_deps.repos
@@ -0,0 +1,12 @@
+repositories:
+  ros2/rmw:
+    type: git
+    url: https://github.com/ros2/rmw.git
+    version: master
+  ros2/rmw_fastrtps:
+    type: git
+    url: https://github.com/ros2/rmw_fastrtps.git
+    version: master
+  ros2/rmw_implementation:
+    type: git
+    url: https://github.com/ros2/rmw_implementation.git
diff --git a/instrumentation.repos b/instrumentation.repos
index a03675c..c1b3d1b 100644
--- a/instrumentation.repos
+++ b/instrumentation.repos
@@ -1,9 +1,9 @@
 repositories:
   ros2/rcl:
     type: git
-    url: https://gitlab.com/boschresearch/ros-wg/tracing/rcl.git
+    url: https://gitlab.com/ros_tracing/rcl.git
     version: instrumentation
   ros2/rclcpp:
     type: git
-    url: https://gitlab.com/boschresearch/ros-wg/tracing/rclcpp.git
+    url: https://gitlab.com/ros_tracing/rclcpp.git
     version: instrumentation
diff --git a/tracetools_read/package.xml b/tracetools_read/package.xml
index eaf6c87..4e29293 100644
--- a/tracetools_read/package.xml
+++ b/tracetools_read/package.xml
@@ -9,7 +9,7 @@
   <license>Apache 2.0</license>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
-  <exec_depend>python3-babeltrace</exec_depend>
+  <!-- <exec_depend>python3-babeltrace</exec_depend> -->
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>