diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17c9dfed2590060a48e4c53541f92cac60b4a6cd..0e4857fd06b249a27e7a546660839be2182b054c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,8 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p7g2)
+gaudi_project(Geant4 v95r2p7g3
+              DATA Geant4Files VERSION v95r*)
 
 file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../include ${CMAKE_INSTALL_PREFIX}/include)
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 5de0a4b195eb5b4ee4ee91a00b3efc8c5a23cc8f..229c7cdd0aee9f29576d4c73e196683338184be0 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,7 @@
 project GEANT4
 
-use GAUDI	GAUDI_v25r2
+use GAUDI	GAUDI_v25r6
+use PARAM
 
 build_strategy	with_installarea
 setup_strategy	root
diff --git a/toolchain.cmake b/toolchain.cmake
index bc11cb7b49ce67bbcd2a6356089e41ebfcd05784..b642413cba9aa2de3c821d817e8323fbef7a5967 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,11 +1 @@
-# Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 68)
-
-find_file(use_heptools_module UseHEPTools.cmake
-          HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-# this check is needed because the toolchain seem to be called a second time
-# without the proper cache
-if(use_heptools_module)
-  include(${use_heptools_module})
-  use_heptools(${heptools_version})
-endif()
+include($ENV{LBUTILSROOT}/data/toolchain.cmake)