diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad62c54adf3c591ab759bde69db89c23f9e2923c..298919c16f8f393f1f221f3f7c0aa28b3f0e2ecb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p8
+gaudi_project(Geant4 v95r2p8g1
               DATA Geant4Files VERSION v95r*)
 
 file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 229c7cdd0aee9f29576d4c73e196683338184be0..2874c13cf195188d730bdb9a455c782f71d321de 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,6 @@
 project GEANT4
 
-use GAUDI	GAUDI_v25r6
+use GAUDI	GAUDI_v25r6p1
 use PARAM
 
 build_strategy	with_installarea
diff --git a/toolchain.cmake b/toolchain.cmake
index 0cc5838a79c75d9ef958245a9469bb14fe4c9933..9ac10a77543e64d6a3e6491ff92f692e7c993e7b 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 71)
+set(heptools_version 71root6)
 
 find_file(use_heptools_module UseHEPTools.cmake
           HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)