diff --git a/.gitmodules b/.gitmodules
index 161b0d5081eeaf95d070fb49af199b489ba698a0..e7b943f79a0d1d8f73f76610d4994ab652a060c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,14 @@
 	url = ../petrack-3rdparty.git
 	shallow = true
 [submodule "ezc3d"]
-	path = ezc3d
+	path = deps/ezc3d
 	url = https://github.com/pyomeca/ezc3d.git
 [submodule "spdlog"]
-	path = spdlog
+	path = deps/spdlog
 	url = https://github.com/gabime/spdlog.git
+[submodule "trompeloeil"]
+	path = deps/trompeloeil
+	url = https://github.com/rollbear/trompeloeil.git
+[submodule "Catch2"]
+	path = deps/Catch2
+	url = https://github.com/catchorg/Catch2
diff --git a/3rdparty b/3rdparty
index 495a280ac146cec7c9d5b77d81dfffd3dad458f7..0df8b30c9bee772f12765a185be9a19bc577ec25 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 495a280ac146cec7c9d5b77d81dfffd3dad458f7
+Subproject commit 0df8b30c9bee772f12765a185be9a19bc577ec25
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce44071f1a4e14b8de1666b6a84647053ce3212..b81c3a7fbf9d471959107bae0b0327c0c5f9f46f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,12 +129,12 @@ endif()
 # Dependencies
 ################################################################################
 # spdlog
-add_subdirectory(spdlog)
+add_subdirectory(deps/spdlog)
 
 # ezc3d
 set(DUMMY ${BUILD_SHARED_LIBS})
 set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Choose if build should be a dynamic or static library")
-add_subdirectory(ezc3d/ EXCLUDE_FROM_ALL)
+add_subdirectory(deps/ezc3d/ EXCLUDE_FROM_ALL)
 # disbale warnings for ezc3d on MSVC
 target_compile_options(ezc3d PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/w>)
 set(BUILD_SHARED_LIBS ${DUMMY})
@@ -297,20 +297,15 @@ endif(WIN32)
 ################################################################################
 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()
+    add_subdirectory("${CMAKE_SOURCE_DIR}/deps/Catch2")
+    add_subdirectory("${CMAKE_SOURCE_DIR}/deps/trompeloeil")
 
     add_subdirectory(${CMAKE_SOURCE_DIR}/tests/unit_test)
     target_link_libraries(petrack_tests PRIVATE petrack_core git-info)
 
     target_compile_definitions(petrack_tests PUBLIC PETRACK_VERSION="${PROJECT_VERSION}")
 
-    target_link_libraries(petrack_tests PRIVATE Catch2::Catch2 Qt5::Test trompeloeil)
+    target_link_libraries(petrack_tests PRIVATE Catch2::Catch2 Qt5::Test trompeloeil::trompeloeil)
     target_include_directories(petrack_tests PRIVATE
       "${CMAKE_CURRENT_BINARY_DIR}/petrack_core_autogen/include")
 
diff --git a/container/ubuntu/Dockerfile b/container/ubuntu/Dockerfile
index c47ce2ce19d595aca66ba84c873e2dfff5e68c2c..1702832ffe2d928d7438c12b5510966f0f94d9c4 100644
--- a/container/ubuntu/Dockerfile
+++ b/container/ubuntu/Dockerfile
@@ -40,17 +40,4 @@ ENV PATH="/5.15.2/gcc_64/lib/cmake/Qt5:${PATH}"
 RUN apt-get update && apt-get install -y \
 	libqwt-qt5-dev \
 	libopencv-dev \
-	libopencv-contrib4.5 \
-    catch2
-
-# Install trompeloeil from source (not in package manager)
-RUN 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
-
-
+	libopencv-contrib4.5
diff --git a/deps/Catch2 b/deps/Catch2
new file mode 160000
index 0000000000000000000000000000000000000000..182c910b4b63ff587a3440e08f84f70497e49a81
--- /dev/null
+++ b/deps/Catch2
@@ -0,0 +1 @@
+Subproject commit 182c910b4b63ff587a3440e08f84f70497e49a81
diff --git a/ezc3d b/deps/ezc3d
similarity index 100%
rename from ezc3d
rename to deps/ezc3d
diff --git a/spdlog b/deps/spdlog
similarity index 100%
rename from spdlog
rename to deps/spdlog
diff --git a/deps/trompeloeil b/deps/trompeloeil
new file mode 160000
index 0000000000000000000000000000000000000000..ba406bfd71caf63f2180990a390ff5518e570c21
--- /dev/null
+++ b/deps/trompeloeil
@@ -0,0 +1 @@
+Subproject commit ba406bfd71caf63f2180990a390ff5518e570c21