diff --git a/.gitmodules b/.gitmodules
index 0971a2dff..1633779ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "submodules/externals/minizip"]
 	path = submodules/externals/minizip
-	url = https://gitlab.linphone.org/BC/public/external/minizip.git
+	url = ../../public/external/minizip.git
 [submodule "linphone-sdk"]
 	path = linphone-sdk
-	url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
+	url = ../../public/linphone-sdk.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d27b0fbf..7aa07679f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,17 +97,11 @@ set(QT5_PACKAGES_OPTIONAL TextToSpeech)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-if (LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
-  include("${EP_linphone_CONFIG_DIR}/wrappers/cpp/LinphoneCxxConfig.cmake")
-  include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
-  include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake")
-  include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
-else ()
-  find_package(LinphoneCxx REQUIRED)
-  find_package(BcToolbox REQUIRED)
-  find_package(Belcard REQUIRED)
-  find_package(Mediastreamer2 REQUIRED)
-endif ()
+find_package(LinphoneCxx CONFIG REQUIRED)
+find_package(bctoolbox CONFIG REQUIRED)
+find_package(belcard CONFIG REQUIRED)
+find_package(Mediastreamer2 CONFIG REQUIRED)
+
 find_package(Minizip REQUIRED)
 
 set(SOURCES