diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10016e18c1410e6f2c5ee268fd30e96e2627b82d..588fed85d9812e89222a5b6b435df8d89776a5e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 
-# NO_NINJA : Geant4 build fails with Ninja
-
 set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources")
 set(GEANT4FILES_VERSION v106r1 CACHE STRING "Version for Geant4Files to match Geant4-src version")
 
diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt
index 3a316b1fba2d1785a1626317a1fa24a818b96963..3839f7f2e0776f48c97b0493ebbbe47a39f4b994 100644
--- a/Geant4/G4config/CMakeLists.txt
+++ b/Geant4/G4config/CMakeLists.txt
@@ -60,7 +60,7 @@ ExternalProject_Add(Geant4
               -DGEANT4_USE_NETWORKVRML=ON
               -DGEANT4_USE_NETWORKDAWN=ON
               -DGEANT4_USE_INVENTOR=OFF
-              -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/$ENV{CMTCONFIG}
+              -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/${BINARY_TAG}
               -DCMAKE_INSTALL_LIBDIR=lib
               -DGEANT4_INSTALL_DATADIR=${G4DATA}
               -DGEANT4_BUILD_VERBOSE_CODE=${G4VERBOSE}
diff --git a/toolchain.cmake b/toolchain.cmake
index 797c20d48ddc6aa174bdca9fc2d4a6329dd965ab..45a254fa3bfc57fff9882eec7fdc105629998468 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -23,7 +23,8 @@ if(NOT CMAKE_SOURCE_DIR MATCHES "CMakeTmp")
     # - ninja (it requires LD_LIBRARY_PATH set to run)
     # - Gaudi (we do not want to use it from LCG)
     # - xenv (conflicts with the version in the build environment)
-    list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv)")
+    # - git (requires a special environment provided only by LCG views)
+    list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv|git)/")
   endif()
 
 endif()