diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86974bb4592568013f539c3530088bf89ada3d8a..17c9dfed2590060a48e4c53541f92cac60b4a6cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p7g1)
+gaudi_project(Geant4 v95r2p7g2)
 
 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 4bf1cbf278624cd5131d76f4e26e0fc59f2ebc1a..5de0a4b195eb5b4ee4ee91a00b3efc8c5a23cc8f 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,6 @@
 project GEANT4
 
-use GAUDI	GAUDI_v24r2
+use GAUDI	GAUDI_v25r2
 
 build_strategy	with_installarea
 setup_strategy	root
diff --git a/toolchain.cmake b/toolchain.cmake
index d423eb81c5a843c1e95c7ec3418b3ccf22812ec3..bc11cb7b49ce67bbcd2a6356089e41ebfcd05784 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,5 +1,5 @@
 # Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 66)
+set(heptools_version 68)
 
 find_file(use_heptools_module UseHEPTools.cmake
           HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)