diff --git a/Analysis/TotalInvMass/CMakeLists.txt b/Analysis/TotalInvMass/CMakeLists.txt
index 779dc0c3c530b582ac027d70f6b58bcb69593ab8..6a9be88ec6a7332efd371b9aa91c4f5a0956623b 100644
--- a/Analysis/TotalInvMass/CMakeLists.txt
+++ b/Analysis/TotalInvMass/CMakeLists.txt
@@ -1,10 +1,4 @@
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(EDM4HEP REQUIRED)
-find_package(GSL REQUIRED ) 
-find_package(LCIO REQUIRED ) 
-find_package(k4FWCore REQUIRED)
-
 gaudi_add_module(TotalInvMass
                  SOURCES src/TotalInvMass.cc
                  LINK k4FWCore::k4FWCore 
diff --git a/Detector/DetSegmentation/CMakeLists.txt b/Detector/DetSegmentation/CMakeLists.txt
index 4580fba55c0987189d86a1970f79109c3fa991a1..9b0273348b5b524c7624a6cc1016873e742fce96 100644
--- a/Detector/DetSegmentation/CMakeLists.txt
+++ b/Detector/DetSegmentation/CMakeLists.txt
@@ -7,8 +7,6 @@ set(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH}  ${DD4hep_ROOT}/cmake )
 
 include(DD4hep)
 
-find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
-
 gaudi_add_library(DetSegmentation
                   SOURCES src/GridDriftChamber.cpp
                   LINK Gaudi::GaudiKernel
diff --git a/Detector/GeomSvc/CMakeLists.txt b/Detector/GeomSvc/CMakeLists.txt
index a4b10c8b08b30198e991e0a5462ba26e27067a3c..137aa0e58561f914a5f8b194b5038c11b9f7d308 100644
--- a/Detector/GeomSvc/CMakeLists.txt
+++ b/Detector/GeomSvc/CMakeLists.txt
@@ -4,10 +4,6 @@
 #    Desc: implement the IGeomSvc interface.
 ##############################################################################
 
-find_package(ROOT COMPONENTS MathCore GenVector Geom Tree)
-find_package(DD4hep COMPONENTS DDG4 DDRec REQUIRED)
-find_package(GEAR REQUIRED)
-
 gaudi_add_module(GeomSvc
                  SOURCES src/GeomSvc.cpp
                  LINK
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index 9cc17c8c9bf54c35c0a12b1086760d4b4a2f9045..8246da79bab1c211208b1f8ca28f5e117d564668 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -1,11 +1,3 @@
-
-find_package(k4FWCore)
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(EDM4HEP REQUIRED )
-
-find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
-
 ## Modules
 gaudi_add_module(DCHDigi
                  SOURCES src/DCHDigiAlg.cpp
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt
index fe75a60e0ddd47fffd9b6b169d62618238753f07..cc6bf3892ef7ebbff268e2f9560acc8609699fbe 100644
--- a/Digitisers/G2CDArbor/CMakeLists.txt
+++ b/Digitisers/G2CDArbor/CMakeLists.txt
@@ -1,12 +1,3 @@
-
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(EDM4HEP REQUIRED)
-find_package(GEAR REQUIRED)
-find_package(GSL REQUIRED ) 
-find_package(LCIO REQUIRED ) 
-find_package(k4FWCore REQUIRED)
-
 # Modules
 gaudi_add_module(G2CDArbor
                  SOURCES src/G2CDArborAlg.cpp
diff --git a/Digitisers/SimHitMerge/CMakeLists.txt b/Digitisers/SimHitMerge/CMakeLists.txt
index 1a07af8918ea0decefe2466f2411dcc5dad55b8f..4c89a1b84a5878fc6862bc1bf81e750551a2c7ed 100644
--- a/Digitisers/SimHitMerge/CMakeLists.txt
+++ b/Digitisers/SimHitMerge/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(EDM4HEP REQUIRED)
-find_package(k4FWCore REQUIRED)
-
 # Modules
 gaudi_add_module(SimHitMerge
                  SOURCES src/SimHitMergeAlg.cpp
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt
index 85862c3e46b099c5bf4f76d36b8a695d99ec96bb..4e2687bc123eeb14f5b013af3cf0461ec48605db 100644
--- a/Digitisers/SimpleDigi/CMakeLists.txt
+++ b/Digitisers/SimpleDigi/CMakeLists.txt
@@ -1,11 +1,3 @@
-
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(GEAR REQUIRED)
-find_package(GSL REQUIRED ) 
-find_package(LCIO REQUIRED ) 
-find_package(k4FWCore REQUIRED)
-find_package(EDM4HEP REQUIRED)
-
 # Modules
 gaudi_add_module(SimpleDigi 
                  SOURCES src/PlanarDigiAlg.cpp
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index e71a4770c11e5e969506f2c3af9b1bce05df7088..9c00a9eaa78745d8e3ddac59f1377379e7d3db6b 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -1,10 +1,3 @@
-
-find_package(podio REQUIRED)
-find_package(LCIO REQUIRED)
-find_package(EDM4HEP REQUIRED)
-find_package(k4FWCore REQUIRED)
-find_package(DD4hep COMPONENTS DDRec DDParsers REQUIRED)
-
 # Headers and Libraries
 
 # Modules
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 8350f8b1be6450862e2d02426b9b265bf6f061ea..0a244a3aa61afe39e9c8fa48ab7344a5866db4de 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -3,14 +3,6 @@
 find_package(Geant4 REQUIRED)
 include(${Geant4_USE_FILE})
 
-find_package(ROOT COMPONENTS RIO Tree TreePlayer MathCore Net Graf3d Graf Gpad EG REQUIRED)
-find_package(LCIO)
-find_package(podio)
-find_package(EDM4HEP)
-find_package(HepMC)
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(k4FWCore REQUIRED)
-
 gaudi_add_module(GenAlgo
                  SOURCES src/IGenTool.cpp 
                          src/GenAlgo.cpp 
diff --git a/Reconstruction/DCHDedx/CMakeLists.txt b/Reconstruction/DCHDedx/CMakeLists.txt
index 2f2071859166e9e71373c9f285cc505a6ebe7d6b..3303351eb6232aa252044695fe6228d6a93208d4 100644
--- a/Reconstruction/DCHDedx/CMakeLists.txt
+++ b/Reconstruction/DCHDedx/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-find_package(k4FWCore)
-find_package(EDM4HEP REQUIRED ) 
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 # Modules
 gaudi_add_module(DCHDedx
                  SOURCES src/RecDCHDedxAlg.cpp
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Reconstruction/Digi_Calo/CMakeLists.txt
index 289c5a45d27471ef22d53e2eaa887a5c2ec5b79d..e3c5b9d4686d117ec7489f90011acc324af150bf 100644
--- a/Reconstruction/Digi_Calo/CMakeLists.txt
+++ b/Reconstruction/Digi_Calo/CMakeLists.txt
@@ -1,11 +1,4 @@
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(EDM4HEP REQUIRED )
-find_package(k4FWCore REQUIRED )
-
-find_package(CLHEP REQUIRED)
-
 ## Modules
 gaudi_add_module(Digi_Calo
                  SOURCES src/CaloDigiAlg.cpp
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
index bf3b0eeb4fe6b974ed96d2d8b28163074e595a73..80307e39ad0df371f0a6fd107cf04155a8571136 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
@@ -1,17 +1,4 @@
 
-find_package(LCIO REQUIRED ) 
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(GEAR REQUIRED)
-find_package(CLHEP REQUIRED;CONFIG)
-
-find_package(EDM4HEP REQUIRED )
-find_package(k4FWCore REQUIRED )
-
-find_package(PandoraSDK REQUIRED ) 
-find_package(LCContent REQUIRED ) 
-
-find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
-
 # Modules
 gaudi_add_module(GaudiPandora
                  SOURCES src/PandoraPFAlg.cpp
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
index 8faef547729a62238a5f45bba6f914286a2ea63e..84ba59b342928ec9b6819285eb2aad4c8a265788 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/CMakeLists.txt
@@ -1,16 +1,3 @@
-
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(LCIO REQUIRED ) 
-find_package(GEAR REQUIRED)
-find_package(EDM4HEP REQUIRED ) 
-find_package(k4FWCore REQUIRED ) 
-
-find_package(PandoraSDK REQUIRED ) 
-find_package(LCContent REQUIRED ) 
-
-find_package(ROOT REQUIRED COMPONENTS Eve Geom RGL EG)
-
 # Modules
 gaudi_add_module(MatrixPandora
                  SOURCES src/PandoraMatrixAlg.cpp
diff --git a/Reconstruction/SiliconTracking/CMakeLists.txt b/Reconstruction/SiliconTracking/CMakeLists.txt
index 7dd051800d8674575671788d28353e2298e6f720..9eb87350466e1836ee641b685b1a9ac24e084126 100644
--- a/Reconstruction/SiliconTracking/CMakeLists.txt
+++ b/Reconstruction/SiliconTracking/CMakeLists.txt
@@ -1,11 +1,4 @@
 
-find_package(GEAR REQUIRED)
-find_package(GSL REQUIRED ) 
-find_package(LCIO REQUIRED )
-find_package(EDM4HEP REQUIRED ) 
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-find_package(k4FWCore)
-
 # Modules
 gaudi_add_module(SiliconTracking
                  SOURCES src/ForwardTrackingAlg.cpp
diff --git a/Reconstruction/Tracking/CMakeLists.txt b/Reconstruction/Tracking/CMakeLists.txt
index b60bca6ad8f5e55175dc4cfe516a3074b7ae09dc..3dd11b3332d73041ae8ca50f21bd48012423c9cd 100644
--- a/Reconstruction/Tracking/CMakeLists.txt
+++ b/Reconstruction/Tracking/CMakeLists.txt
@@ -1,10 +1,4 @@
 
-find_package(GEAR REQUIRED)
-find_package(GSL REQUIRED ) 
-find_package(LCIO REQUIRED ) 
-find_package(EDM4HEP REQUIRED ) 
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 # Modules
 gaudi_add_module(Tracking
                  SOURCES src/Clupatra/ClupatraAlg.cpp
diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt
index d8edef6755f1d090e9ee4b466238cceb4de994b1..248cf3dfebc8ce42bca6f4e45c1803293989f853 100644
--- a/Service/GearSvc/CMakeLists.txt
+++ b/Service/GearSvc/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-find_package(GEAR REQUIRED)
-
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 gaudi_add_header_only_library(GearSvc)
 
 gaudi_add_module(GearSvcPlugins
diff --git a/Service/TrackSystemSvc/CMakeLists.txt b/Service/TrackSystemSvc/CMakeLists.txt
index 44b3eb9cffacf312c8e1e569ed10777dcfca8ca4..67710976b6990942ab95d781ccf8fbf9ad1ca90a 100644
--- a/Service/TrackSystemSvc/CMakeLists.txt
+++ b/Service/TrackSystemSvc/CMakeLists.txt
@@ -1,14 +1,5 @@
 # gaudi_subdir(TrackSystemSvc v0r0)
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(ROOT 6.14 REQUIRED COMPONENTS Matrix Physics)
-find_package(GEAR REQUIRED)
-find_package(LCIO REQUIRED)
-find_package(EDM4HEP REQUIRED)
-#find_package(KalTest REQUIRED)
-#find_package(KalDet REQUIRED)
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 gaudi_add_library(TrackSystemSvcLib
                   SOURCES src/HelixFit.cc
                           src/HelixTrack.cc
diff --git a/Simulation/DetSimAna/CMakeLists.txt b/Simulation/DetSimAna/CMakeLists.txt
index 01b4d5d6d8ddd328e811d071aee25989b7a23835..794bcc2faab238a6196d8c8b949b98316b4add9a 100644
--- a/Simulation/DetSimAna/CMakeLists.txt
+++ b/Simulation/DetSimAna/CMakeLists.txt
@@ -1,11 +1,6 @@
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-
-# For EDM & I/O
-find_package(EDM4HEP REQUIRED)
-
 
 gaudi_add_module(DetSimAna
                  SOURCES src/Edm4hepWriterAnaElemTool.cpp
diff --git a/Simulation/DetSimCore/CMakeLists.txt b/Simulation/DetSimCore/CMakeLists.txt
index e9ae024a4e7147c09adae46ab4f45f40d5aecd86..9c225fc7332999dc1bd7ca9088a33d8b6b0e46f9 100644
--- a/Simulation/DetSimCore/CMakeLists.txt
+++ b/Simulation/DetSimCore/CMakeLists.txt
@@ -2,8 +2,6 @@
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
 
-find_package(EDM4HEP REQUIRED)
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 
 message(" Geant4_LIBRARIES: ${Geant4_LIBRARIES}")
 
diff --git a/Simulation/DetSimDedx/CMakeLists.txt b/Simulation/DetSimDedx/CMakeLists.txt
index 7760d417073157b41d08ce66caadb1ce9f7a3307..fb8e4d3a65429de7514834b96268b8cae7b611fb 100644
--- a/Simulation/DetSimDedx/CMakeLists.txt
+++ b/Simulation/DetSimDedx/CMakeLists.txt
@@ -1,9 +1,6 @@
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-find_package(EDM4HEP REQUIRED )
-include_directories(${EDM4HEP_INCLUDE_DIR})
 
 gaudi_add_module(DetSimDedx
                  SOURCES src/DummyDedxSimTool.cpp
diff --git a/Simulation/DetSimFastModel/CMakeLists.txt b/Simulation/DetSimFastModel/CMakeLists.txt
index 420b93f09f758b11df97e745b9ab6e0309681349..50ceb1e33fdd4634f93dffb710a1d020dc58aea4 100644
--- a/Simulation/DetSimFastModel/CMakeLists.txt
+++ b/Simulation/DetSimFastModel/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
+
 
 gaudi_add_module(DetSimFastModel
                  SOURCES src/DummyFastSimG4Tool.cpp
diff --git a/Simulation/DetSimGeom/CMakeLists.txt b/Simulation/DetSimGeom/CMakeLists.txt
index f9cf4b54b0c83135adc7adff93acce8a985a7bce..aec488006934729263b1872cf49bfea7c9f4538c 100644
--- a/Simulation/DetSimGeom/CMakeLists.txt
+++ b/Simulation/DetSimGeom/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 
 gaudi_add_module(DetSimGeom 
                  SOURCES src/WorldDetElemTool.cpp
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index b6b81ee10f482f183b31987daf2067d0a9c531b0..eed28a788b4893b6a771aa965f15759b3f2addfa 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -1,10 +1,6 @@
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
-find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-
-set(DetSimSD_srcs
-)
 
 gaudi_add_module(DetSimSD 
                  SOURCES src/CalorimeterSensDetTool.cpp
diff --git a/Utilities/DataHelper/CMakeLists.txt b/Utilities/DataHelper/CMakeLists.txt
index 5300866df62d8a3a0185b84baa59b8068c2ab072..0583b24bdabbbe3328ac3c8d357502ba2115fe9c 100644
--- a/Utilities/DataHelper/CMakeLists.txt
+++ b/Utilities/DataHelper/CMakeLists.txt
@@ -1,12 +1,4 @@
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(EDM4HEP REQUIRED)
-find_package(GSL REQUIRED )
-message("GSL: ${GSL_LIBRARIES} ")
-message("GSL INCLUDE_DIRS: ${GSL_INCLUDE_DIRS} ")
-
-#gaudi_install_headers(DataHelper)
-
 gaudi_add_library(DataHelperLib 
                   SOURCES src/CaloHitExtended.cc
                           src/Circle.cc
diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index e85a9ccd6186d316b658bd59006e54d16fca6979..faacdc5b6132c6762b8098a79a6b90184f59526c 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -3,13 +3,6 @@
 #    Desc: import from ILCSoft
 ##############################################################################
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(LCIO)
-find_package(GEAR)
-find_package(ROOT COMPONENTS MathCore)
-find_package(EDM4HEP REQUIRED)
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 get_target_property(to_incl KalTestLib SOURCE_DIR)
 if (to_incl)
   LIST( APPEND DICT_INCLUDE_DIRS ${to_incl}/include)
diff --git a/Utilities/KalTest/CMakeLists.txt b/Utilities/KalTest/CMakeLists.txt
index 907e987770489541434506bd098b9032b23a687a..d1a29b90d61522b3804673af3636b3ba62641694 100644
--- a/Utilities/KalTest/CMakeLists.txt
+++ b/Utilities/KalTest/CMakeLists.txt
@@ -3,8 +3,6 @@
 #    Desc: import from ILCSoft
 ##############################################################################
 
-find_package(ROOT REQUIRED COMPONENTS MathCore)
-
 set( DICT_CINT_DEFINITIONS "HANDLE_DICT_EXCEPTIONS=IGNORED_FOR_CINT" )
 set( DICT_INPUT_DIRS geomlib kallib kaltracklib utils )
 set( DICT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/rootdict )
diff --git a/Utilities/KiTrack/CMakeLists.txt b/Utilities/KiTrack/CMakeLists.txt
index a56283d602f2fb89e852cd35775c6b7198a22d8d..6beed3c6cdd723246c7332fcc76dabfe55a99677 100644
--- a/Utilities/KiTrack/CMakeLists.txt
+++ b/Utilities/KiTrack/CMakeLists.txt
@@ -1,12 +1,4 @@
 
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(ROOT REQUIRED)
-#find_package(DD4hep REQUIRED)
-find_package(GSL REQUIRED)
-find_package(EDM4HEP REQUIRED)
-find_package(LCIO REQUIRED)
-find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-
 gaudi_add_library(KiTrackLib 
                   SOURCES src/KiTrack/Automaton.cc 
                           src/KiTrack/HopfieldNeuralNet.cc 
diff --git a/cmake/CEPCSWDependencies.cmake b/cmake/CEPCSWDependencies.cmake
index 49025c4631fa849347707e904f44de7da07cd84b..92d8911e3e65a9a6f09548c2aec2b73a082e4c61 100644
--- a/cmake/CEPCSWDependencies.cmake
+++ b/cmake/CEPCSWDependencies.cmake
@@ -2,9 +2,32 @@
 
 Find all the dependencies here, so in each package user don't need to find the packages again.
 
+- CLHEP
+- DD4hep
+- EDM4hep
 - Gaudi
+- Geant4
+- GEAR
+- GSL
+- HepMC
 - k4FWCore
-- EDM4hep
-- DD4hep
-
+- LCContent
+- LCIO
+- PandoraSDK
+- podio
+- ROOT
 #]]
+
+find_package(CLHEP REQUIRED;CONFIG)
+find_package(DD4hep COMPONENTS DDCore DDG4 DDParsers DDRec REQUIRED)
+find_package(EDM4HEP REQUIRED)
+find_package(Geant4 REQUIRED ui_all vis_all)
+find_package(GEAR REQUIRED)
+find_package(GSL REQUIRED)
+find_package(HepMC)
+find_package(k4FWCore REQUIRED)
+find_package(LCContent REQUIRED)
+find_package(LCIO REQUIRED)
+find_package(PandoraSDK REQUIRED)
+find_package(podio REQUIRED)
+find_package(ROOT COMPONENTS EG Graf Graf3d Gpad MathCore Net RIO Tree TreePlayer REQUIRED)