diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e047245..38b4a51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,20 @@
-image: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base:latest
-
 variables:
   DOCKER_DRIVER: overlay2
   PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace
-  base_image_id: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base
+  base_image_id: registry.gitlab.com/micro-ros/ros_tracing/ros2_tracing/ci-base
 
 services:
   - docker:dind
 
-before_script:
-  - vcs import < instrumentation.repos
+stages:
+ - deps
+ - build
 
 build_enabled:
   image: $base_image_id
+  stage: build
   script:
+    - vcs import < instrumentation.repos
     - lttng-sessiond --daemonize
     - . /root/ws/install/local_setup.sh
     - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST
@@ -33,10 +34,12 @@ build_enabled:
     - /.*docker.*/
         
 ci_base_image:
+  stage: deps
   image: docker:stable
   script:
     - docker build --tag $base_image_id -f docker-ci-base/Dockerfile .
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
     - docker push $base_image_id
   only:
-    - /.*docker.*/
\ No newline at end of file
+    - /.*docker.*/
+    - scheduled
\ No newline at end of file