diff --git a/cmake/toolchain/heptools-dev3.cmake b/cmake/toolchain/heptools-dev3.cmake
index 51d1f9c45ea0662e7ae6c25426b5b4955c460e53..371a3ee83c83d55da160582f2dbda9647c7dbeea 100644
--- a/cmake/toolchain/heptools-dev3.cmake
+++ b/cmake/toolchain/heptools-dev3.cmake
@@ -8,7 +8,7 @@ include(heptools-dev-generators)
 LCG_external_package(ROOT         HEAD   GIT=http://root.cern.ch/git/root.git        )
 LCG_external_package(hepmc3       HEAD   GIT=https://gitlab.cern.ch/hepmc/HepMC3.git )
 LCG_external_package(DD4hep        master   GIT=https://github.com/AIDASoft/DD4hep.git   )
-if(${LCG_OS}${LCG_OSVERS} MATCHES centos7|ubuntu18)
+if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu)
   if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 7)) OR (${LCG_COMP} MATCHES clang))
     LCG_external_package(Gaudi master   GIT=https://gitlab.cern.ch/gaudi/Gaudi.git)
   endif()