diff --git a/CMakeLists.txt b/CMakeLists.txt
index 518baf442fc0a576a2d237ca1939f062366868da..d206821f4e8e974d96f53c7cefa719d17f1555bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL
 ########################
 
 # Configure ROOT
-find_package (ROOT 6.08 REQUIRED)
+find_package (ROOT 6.08 REQUIRED CONFIG)
 DD4HEP_SETUP_ROOT_TARGETS()
 
 # Configure BOOST
@@ -129,7 +129,7 @@ DD4HEP_SETUP_BOOST_TARGETS()
 
 # Configure Geant4
 if(DD4HEP_USE_GEANT4)
-  find_package( Geant4 10.2.2 REQUIRED  gdml ui_all vis_all )
+  find_package( Geant4 10.2.2 REQUIRED  gdml ui_all vis_all CONFIG)
   IF(NOT Geant4_builtin_clhep_FOUND)
     SET(DD4HEP_USE_CLHEP TRUE)
   ENDIF()
@@ -141,7 +141,7 @@ if(DD4HEP_USE_GEANT4)
 endif()
 
 if(DD4HEP_USE_LCIO)
-  find_package(LCIO REQUIRED)
+  find_package(LCIO REQUIRED CONFIG)
   DD4HEP_SETUP_LCIO_TARGETS()
 endif()
 
@@ -150,7 +150,7 @@ IF(DD4HEP_USE_HEPMC3)
 ENDIF()
 
 if(DD4HEP_USE_TBB)
-  find_package(TBB REQUIRED)
+  find_package(TBB REQUIRED CONFIG)
 endif()
 
 
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 5b5c88c081ae7d1acce673ba985d2aff4269fc50..05d9c294171fe223abba12c90f9fbed2f8fd1569 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -802,7 +802,7 @@ MACRO(DD4HEP_SETUP_GEANT4_TARGETS)
 
     else()
       IF(NOT TARGET CLHEP::CLHEP)
-        FIND_PACKAGE(CLHEP REQUIRED)
+        FIND_PACKAGE(CLHEP REQUIRED CONFIG)
       ENDIF()
       set(CLHEP CLHEP::CLHEP)
       dd4hep_debug("Using External CLHEP")
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 48b7efaf4ab7f00524f0764f941047a9b3587929..1c2d2cbe74d3fdd403c118b51907bd9027464822 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -56,7 +56,7 @@ if(DD4HEP_USE_GEANT4)
     find_dependency(CLHEP REQUIRED CONFIG)
     UNSET(CLHEP_INCLUDE_DIR)
   ENDIF()
-  find_dependency(Geant4 10.2.2 REQUIRED gdml ui_all vis_all)
+  find_dependency(Geant4 10.2.2 REQUIRED gdml ui_all vis_all CONFIG)
   DD4HEP_SETUP_GEANT4_TARGETS()
 endif()