diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d57bf45eb15a0ebc65c700737eb24e2f1c39b85..0f8039e820094bb9b31cec212c6acb2136e1a3e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,8 +29,8 @@ build_linux:
   script:
     - mkdir build
     - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_UNIT_TESTS=ON 
-    - cmake --build . -- -j4    
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_UNIT_TESTS=ON -G Ninja
+    - cmake --build .
   artifacts:
     paths:
       - "./build/"
diff --git a/.gitmodules b/.gitmodules
index 999396a5c6625b9c75eb896a038669c12950f9fc..0fe97f6733b7a68d6c99b1741e878e4d00a63e8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "3rdparty"]
 	path = 3rdparty
-	url = ../petrack-binaries
+	url = ../petrack-3rdparty.git
 	shallow = true
diff --git a/3rdparty b/3rdparty
index 9a2f13a0dd5400628d8b8432988d1506a83d07e9..c87e181f7f0d6d232e06974aff96d83e1be0634d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 9a2f13a0dd5400628d8b8432988d1506a83d07e9
+Subproject commit c87e181f7f0d6d232e06974aff96d83e1be0634d
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cea8df78b4630ac5d24fd379a3fca19152fea29f..3d14a523e9dc0c8679ec0b1a6a37b31921d066cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,13 +224,13 @@ if(BUILD_UNIT_TESTS)
     enable_testing()
     if (USE_3RD_PARTY)
         add_subdirectory("${CMAKE_SOURCE_DIR}/3rdparty/Catch2")
+        add_subdirectory("${CMAKE_SOURCE_DIR}/3rdparty/trompeloeil")
     else()
       find_package(Catch2 REQUIRED)
+      find_package(trompeloeil REQUIRED)
     endif()
 
     find_package(Qt5Test REQUIRED)
-    find_package(trompeloeil REQUIRED
-      HINTS "${CMAKE_SOURCE_DIR}/3rdparty/trompeloeil/lib/cmake/trompeloeil")
 
     add_subdirectory(${CMAKE_SOURCE_DIR}/tests/unit_test)
     target_link_libraries(petrack_tests PRIVATE petrack_core)
diff --git a/container/arch/Dockerfile b/container/arch/Dockerfile
index 16bd76cdc2801c1d19e553318bf97483e6652bdb..717aa87e5a53f13f26b29b05c155e99a721d696a 100644
--- a/container/arch/Dockerfile
+++ b/container/arch/Dockerfile
@@ -10,7 +10,7 @@ RUN pacman -Syu --needed --noconfirm \
 	cmake \
 	make \
 	base-devel \
-	glew
+	ninja
 
 # Install the needed libraries
 RUN pacman -Syu --needed --noconfirm \
@@ -24,6 +24,18 @@ RUN pacman -Syu --needed --noconfirm \
     python-pip
 RUN pip install pytest
 
+# Install trompeloeil from source (not in package manager)
+RUN mkdir deps && \
+    cd deps && \
+    git clone https://github.com/rollbear/trompeloeil.git &&\
+    cd trompeloeil &&\
+    git fetch --all --tags &&\
+    git checkout tags/v38 &&\
+    mkdir build &&\
+    cd build && \
+    cmake .. && \
+    cmake --build . --target install
+
 # Install opencv 4.2 (last command to avoid any updates by pacman)
 RUN pacman --needed --noconfirm -U \
     https://archive.archlinux.org/packages/h/hdf5/hdf5-1.10.5-1-x86_64.pkg.tar.xz \