diff --git a/.gitlab/ci/init_x86_64.sh b/.gitlab/ci/init_x86_64.sh
index c9c3cd17091e941876ed1509ca554fc4e1d5a62b..ad8bdc2dc2e695efc74c2f3fcfcaa8355cbe7625 100644
--- a/.gitlab/ci/init_x86_64.sh
+++ b/.gitlab/ci/init_x86_64.sh
@@ -5,7 +5,7 @@ if [ "$(uname)" = "Linux" ]; then
     if [ "$( cat /etc/*-release | grep "CentOS Linux 7" )" ]; then
         echo "Detected CentOS Linux 7"
         OS=centos7
-    elif [ "$( cat /etc/*-release | grep "CentOS Linux 8" )" ]; then
+    elif [ "$( cat /etc/*-release | grep "CentOS Linux 8" )" ] || [ "$( cat /etc/*-release | grep "CentOS Stream release 8" )" ]; then
         echo "Detected CentOS Linux 8"
         OS=centos8
     else
@@ -15,7 +15,9 @@ if [ "$(uname)" = "Linux" ]; then
 elif [ "$(uname)" = "Darwin" ]; then
     MACOS_MAJOR=$(sw_vers -productVersion | awk -F '.' '{print $1}')
     MACOS_MINOR=$(sw_vers -productVersion | awk -F '.' '{print $2}')
-    if [ $MACOS_MAJOR = "11" ] || [ "${MACOS_MAJOR}.${MACOS_MINOR}" = "10.15" ]; then
+    if [ $MACOS_MAJOR = "11" ]; then
+        OS=mac11
+    elif [ "${MACOS_MAJOR}.${MACOS_MINOR}" = "10.15" ]; then
         OS=mac1015
     else
         echo "Unsupported version of macOS ${MACOS_MAJOR}.${MACOS_MINOR}"
@@ -28,7 +30,7 @@ fi
 
 # Determine is you have CVMFS installed
 CVMFS_MOUNT=""
-if [ "$OS" = mac1015 ]; then
+if [ "$OS" = mac1015 ] || [ "$OS" = mac11 ] ; then
     CVMFS_MOUNT="/Users/Shared"
 fi
 
@@ -48,7 +50,7 @@ fi
 
 
 # Determine which LCG version to use
-DEFAULT_LCG="LCG_99"
+DEFAULT_LCG="LCG_101"
 
 if [ -z ${ALLPIX_LCG_VERSION} ]; then
     echo "No explicit LCG version set, using ${DEFAULT_LCG}."
@@ -66,14 +68,14 @@ if [ -z ${COMPILER_TYPE} ]; then
     fi
 fi
 if [ ${COMPILER_TYPE} = "gcc" ]; then
-    COMPILER_VERSION="gcc10"
+    COMPILER_VERSION="gcc11"
     echo "Compiler type set to GCC, version ${COMPILER_VERSION}."
 fi
 if [ ${COMPILER_TYPE} = "llvm" ]; then
     if [ "$(uname)" = "Darwin" ]; then
         COMPILER_VERSION="clang120"
     else
-        COMPILER_VERSION="clang10"
+        COMPILER_VERSION="clang12"
     fi
     echo "Compiler type set to LLVM, version ${COMPILER_VERSION}."
 fi