diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt
index 987ea6da899491bbc5547fb684ae6f2265d21034..fbf4d634847537409a87555e99144addb216933e 100644
--- a/Digitisers/CMakeLists.txt
+++ b/Digitisers/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(DCHDigi)
-# add_subdirectory(G2DArbor)
+add_subdirectory(G2CDArbor)
 # add_subdirectory(SimHigMerge)
 # add_subdirectory(SimpleDigi)
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index 66df3b323306a82aab0d1a4d976688703a8d07da..9e5cebe1ba482bbb559cf56c7d4e0cde7505caae 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -24,3 +24,8 @@ gaudi_add_module(DCHDigi
                       DetSegmentation
                       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
+install(TARGETS DCHDigi
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt
index cbc70cd8ea041643734cd2e337dbb12516718e1b..0d3e32a6ceebaec0cc1243d9b071bba49b0ca1a3 100644
--- a/Digitisers/G2CDArbor/CMakeLists.txt
+++ b/Digitisers/G2CDArbor/CMakeLists.txt
@@ -1,4 +1,3 @@
-gaudi_subdir(G2CDArbor v0r0)
 
 find_package(CLHEP REQUIRED;CONFIG)
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
@@ -6,23 +5,27 @@ find_package(EDM4HEP REQUIRED)
 find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
-find_package(podio REQUIRED ) 
 find_package(k4FWCore REQUIRED)
 
-message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
-message("EDM4HEP_LIB: ${EDM4HEP_LIBRARIES}")
-include_directories(${EDM4HEP_INCLUDE_DIR})
-
-gaudi_depends_on_subdirs(
-    Service/GearSvc
-    Detector/DetInterface
-)
-
-set(G2CDArbor_srcs src/*.cpp)
+set(G2CDArbor_srcs src/G2CDArborAlg.cpp)
 
 # Modules
-gaudi_add_module(G2CDArbor ${G2CDArbor_srcs}
-    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
-    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(G2CDArbor
+                 SOURCES ${G2CDArbor_srcs}
+                 LINK k4FWCore::k4FWCore
+                      GearSvc
+                      DetInterface
+                      Gaudi::GaudiKernel
+                      Gaudi::GaudiAlgLib 
+                      ${CLHEP_LIBRARIES}
+                      ${GEAR_LIBRARIES} 
+                      ${GSL_LIBRARIES} 
+                      ${LCIO_LIBRARIES}
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
+install(TARGETS G2CDArbor
+  EXPORT CEPCSWTargets
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+  COMPONENT dev)
+
diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.h b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
index 4c9a1985d9da20adc45733d5dbd4fc37043dd1de..910675c9e930e4b3fe9a3c8390604898bf8dfaf2 100644
--- a/Digitisers/G2CDArbor/src/G2CDArborAlg.h
+++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.h
@@ -3,7 +3,7 @@
 
 #include "k4FWCore/DataHandle.h"
 #include "GaudiAlg/GaudiAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "edm4hep/EventHeader.h"
 #include "edm4hep/EventHeaderCollection.h"
 #include "edm4hep/SimCalorimeterHitConst.h"