diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index 826994125bd2d22d391e2d956c50ac1ffa5e5e82..5b20bb73afbc74eb12211ece12a03704cf09e75a 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_subdirectory(DetSimAna)
 add_subdirectory(DetSimCore)
-#add_subdirectory(DetSimDedx)
+add_subdirectory(DetSimDedx)
 #add_subdirectory(DetSimFastModel)
 add_subdirectory(DetSimGeom)
 add_subdirectory(DetSimInterface)
diff --git a/Simulation/DetSimDedx/CMakeLists.txt b/Simulation/DetSimDedx/CMakeLists.txt
index e90963eb2b7a45a1a451fd8d76c047bd3fb6c813..79033891cd1cd5b2b537e9e3a8d028898ef296b3 100644
--- a/Simulation/DetSimDedx/CMakeLists.txt
+++ b/Simulation/DetSimDedx/CMakeLists.txt
@@ -1,9 +1,3 @@
-gaudi_subdir(DetSimDedx v0r0)
-
-gaudi_depends_on_subdirs(
-    k4FWCore
-    Simulation/DetSimInterface
-)
 
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
@@ -17,13 +11,11 @@ set(DetSimDedx_srcs
     src/GFDndxSimTool.cpp
 )
 
-gaudi_add_module(DetSimDedx ${DetSimDedx_srcs}
-    INCLUDE_DIRS
-    LINK_LIBRARIES
-        DD4hep
-        ${DD4hep_COMPONENT_LIBRARIES}
-        GaudiKernel
-    -Wl,--no-as-needed 
-    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(DetSimDedx
+                 SOURCES ${DetSimDedx_srcs}
+                 LINK DetSimInterface
+                      ${DD4hep_COMPONENT_LIBRARIES}
+                      Gaudi::GaudiKernel
+                      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )