diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index b3efd54f9..3bbd6e46d 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -25,8 +25,6 @@ target_link_libraries(DDG4
   PUBLIC
   DD4hep::DDCore
   Geant4::Interface
-  Celeritas::corecel
-  Celeritas::accel
   )
 #
 #Ensure our own includes come before those of the system
@@ -104,6 +102,18 @@ IF(TARGET LCIO::lcio)
 
 ENDIF()
 
+IF(DD4HEP_USE_CELERITAS)
+
+  dd4hep_add_plugin(DDG4Celeritas
+    SOURCES celeritas/*.cpp
+    INCLUDES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/celeritas>
+    USES    DD4hep::DDG4 Celeritas::accel Celeritas::corecel
+    )
+  install(TARGETS DDG4Celeritas EXPORT DD4hep LIBRARY DESTINATION lib)
+  set_target_properties(DDG4Celeritas PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
+
+ENDIF()
+
 IF(TARGET EDM4HEP::edm4hep)
   dd4hep_add_plugin(DDG4EDM4HEP
     SOURCES edm4hep/*.cpp
diff --git a/DDG4/src/Celeritas.cpp b/DDG4/celeritas/Celeritas.cpp
similarity index 100%
rename from DDG4/src/Celeritas.cpp
rename to DDG4/celeritas/Celeritas.cpp
diff --git a/DDG4/include/DDG4/Celeritas.h b/DDG4/celeritas/Celeritas.h
similarity index 100%
rename from DDG4/include/DDG4/Celeritas.h
rename to DDG4/celeritas/Celeritas.h
diff --git a/DDG4/src/Geant4PhysicsList.cpp b/DDG4/src/Geant4PhysicsList.cpp
index 13d10bf2b..fef5a7000 100644
--- a/DDG4/src/Geant4PhysicsList.cpp
+++ b/DDG4/src/Geant4PhysicsList.cpp
@@ -19,7 +19,7 @@
 #include <DD4hep/InstanceCount.h>
 #include <DD4hep/Printout.h>
 #include <DD4hep/Plugins.h>
-#include <DDG4/Celeritas.h>
+#include <DDG4/celeritas/Celeritas.h>
 
 // Geant4 include files
 #include <G4VPhysicsConstructor.hh>