diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6719ff45487ee7354bda31213111e5ce7227423..8ff8cbce9dcc7e0ff0e9d94cd61d5c93d3ee654e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 
 add_subdirectory(Analysis)
 add_subdirectory(Detector)
-# add_subdirectory(Digitisers)
+add_subdirectory(Digitisers)
 add_subdirectory(Examples)
 add_subdirectory(Generator)
 # add_subdirectory(Reconstruction)
diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..987ea6da899491bbc5547fb684ae6f2265d21034
--- /dev/null
+++ b/Digitisers/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(DCHDigi)
+# add_subdirectory(G2DArbor)
+# add_subdirectory(SimHigMerge)
+# add_subdirectory(SimpleDigi)
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index fa9dc143874c99b4550a6f7f259e0a962507bae6..66df3b323306a82aab0d1a4d976688703a8d07da 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -1,25 +1,26 @@
-gaudi_subdir(DCHDigi v0r0)
 
+find_package(k4FWCore)
 find_package(CLHEP REQUIRED;CONFIG)
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 find_package(EDM4HEP REQUIRED )
-include_directories(${EDM4HEP_INCLUDE_DIR})
 
-find_package(podio REQUIRED )
 find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
 
-set(srcs
-    src/*.cpp
+set(DCHDigi_srcs
+    src/DCHDigiAlg.cpp
 )
 
-gaudi_depends_on_subdirs(
-    Detector/DetInterface
-    Detector/DetSegmentation
-)
 ## Modules
-gaudi_add_module(DCHDigi ${srcs}
-    INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT 
-    LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation
-    -Wl,--no-as-needed 
-    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(DCHDigi
+                 SOURCES ${DCHDigi_srcs}
+                 LINK DetInterface
+                      DetSegmentation
+                      k4FWCore::k4FWCore 
+                      Gaudi::GaudiKernel
+                      Gaudi::GaudiAlgLib
+                      ${CLHEP_LIBRARIES}
+                      ${DD4hep_COMPONENT_LIBRARIES}
+                      ${ROOT_LIBRARIES}
+                      DetSegmentation
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )