diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d72dd39..ba5540ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,23 @@ pip_package:
     - VERBOSE=1 pip install --verbose ./python/
     - kiss_icp_pipeline --version
 
+ros1_melodic:
+  image: osrf/ros:melodic-desktop-full
+  stage: build
+  before_script:
+    - apt-get update && sudo apt-get install -y gpg wget
+    - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+    - echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null && apt update
+    - rm /usr/share/keyrings/kitware-archive-keyring.gpg
+    - apt-get install -y kitware-archive-keyring
+    - apt-get install -y cmake
+  script:
+    - rm -rf ~/catkin_ws/
+    - mkdir -p ~/catkin_ws/
+    - cp -r ${CI_PROJECT_DIR} ~/catkin_ws/src
+    - cd ~/catkin_ws/
+    - catkin_make
+
 ros1_noetic:
   image: osrf/ros:noetic-desktop-full
   stage: build
diff --git a/cpp/kiss_icp/3rdparty/tbb/tbb.cmake b/cpp/kiss_icp/3rdparty/tbb/tbb.cmake
index c9bc8546..c80ea2e2 100644
--- a/cpp/kiss_icp/3rdparty/tbb/tbb.cmake
+++ b/cpp/kiss_icp/3rdparty/tbb/tbb.cmake
@@ -22,7 +22,7 @@
 # SOFTWARE.
 # TODO(Nacho): Use mainstream repo from OneAPI instead of my own fork
 include(ExternalProject)
-
+find_package(Threads)
 ExternalProject_Add(
   external_tbb
   PREFIX tbb
@@ -45,5 +45,5 @@ add_library(TBBHelper INTERFACE)
 add_dependencies(TBBHelper external_tbb)
 target_include_directories(TBBHelper INTERFACE ${INSTALL_DIR}/include)
 target_link_directories(TBBHelper INTERFACE ${INSTALL_DIR}/lib)
-target_link_libraries(TBBHelper INTERFACE tbb)
+target_link_libraries(TBBHelper INTERFACE tbb Threads::Threads)
 add_library(TBB::tbb ALIAS TBBHelper)