diff --git a/Reconstruction/CMakeLists.txt b/Reconstruction/CMakeLists.txt
index 0cbb231c765e6d4b389d9fd8d5f4f147c2da9ce8..c491cd6e009a54b248617cd8ace551855a063122 100644
--- a/Reconstruction/CMakeLists.txt
+++ b/Reconstruction/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(DCHDedx)
-# add_subdirectory(Digi_Calo)
+add_subdirectory(Digi_Calo)
 # add_subdirectory(PFA)
 # add_subdirectory(SiliconTracking)
 # add_subdirectory(Tracking)
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Reconstruction/Digi_Calo/CMakeLists.txt
index 179346ca39c4764bab67a382633635546a35e9a2..289c5a45d27471ef22d53e2eaa887a5c2ec5b79d 100644
--- a/Reconstruction/Digi_Calo/CMakeLists.txt
+++ b/Reconstruction/Digi_Calo/CMakeLists.txt
@@ -1,26 +1,25 @@
-gaudi_subdir(Digi_Calo v0r0)
 
 find_package(CLHEP REQUIRED;CONFIG)
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 find_package(EDM4HEP REQUIRED )
-message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
-message("EDM4HEP_LIB: ${EDM4HEP_LIBRARIES}")
-include_directories(${EDM4HEP_INCLUDE_DIR})
+find_package(k4FWCore REQUIRED )
 
 find_package(CLHEP REQUIRED)
-find_package(podio REQUIRED )
 
-set(srcs
-    src/*.cpp
-)
-
-gaudi_depends_on_subdirs(
-    Detector/DetInterface
-)
 ## Modules
-gaudi_add_module(Digi_Calo ${srcs}
-    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep 
-    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
-    -Wl,--no-as-needed 
-    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(Digi_Calo
+                 SOURCES src/CaloDigiAlg.cpp
+                 LINK DetInterface
+                      k4FWCore::k4FWCore
+                      Gaudi::GaudiKernel
+                      Gaudi::GaudiAlgLib
+                      ${CLHEP_LIBRARIES} 
+                      ${DD4hep_COMPONENT_LIBRARIES} 
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
+install(TARGETS Digi_Calo
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
+