diff --git a/Docs/build_linux.md b/Docs/build_linux.md
index 23db401f0..abc333f57 100644
--- a/Docs/build_linux.md
+++ b/Docs/build_linux.md
@@ -64,8 +64,8 @@ __All Ubuntu systems__.
 To avoid compatibility issues between Unreal Engine and the CARLA dependencies, use the same compiler version and C++ runtime library to compile everything. The CARLA team uses clang-8 and LLVM's libc++. Change the default clang version to compile Unreal Engine and the CARLA dependencies.
 
 ```sh
-sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-8/bin/clang++ 180 &&
-sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-8/bin/clang 180
+sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-8/bin/clang++ &&
+sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-8/bin/clang
 ```
 
 Starting with CARLA 0.9.12, users have the option to install the CARLA Python API using `pip` or `pip3`. Version 20.3 or higher is required. To check if you have a suitable version, run the following command:
diff --git a/Util/BuildTools/BuildOSM2ODR.sh b/Util/BuildTools/BuildOSM2ODR.sh
index 2422c5e39..8eca7691c 100755
--- a/Util/BuildTools/BuildOSM2ODR.sh
+++ b/Util/BuildTools/BuildOSM2ODR.sh
@@ -89,8 +89,8 @@ if ${BUILD_OSM2ODR} ; then
   mkdir -p ${OSM2ODR_BUILD_FOLDER}
   cd ${OSM2ODR_BUILD_FOLDER}
   # define clang compiler
-  export CC=/usr/bin/clang-10
-  export CXX=/usr/bin/clang++-10
+  export CC=/usr/bin/clang
+  export CXX=/usr/bin/clang++
 
   cmake ${OSM2ODR_SOURCE_FOLDER} \
       -G "Eclipse CDT4 - Ninja" \
diff --git a/Util/BuildTools/BuildPythonAPI.sh b/Util/BuildTools/BuildPythonAPI.sh
index 519a94faa..84c87d3c3 100755
--- a/Util/BuildTools/BuildPythonAPI.sh
+++ b/Util/BuildTools/BuildPythonAPI.sh
@@ -50,8 +50,8 @@ done
 
 source $(dirname "$0")/Environment.sh
 
-export CC=clang-10
-export CXX=clang++-10
+export CC=clang
+export CXX=clang++
 
 if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_PYTHONAPI} ; }; then
   fatal_error "Nothing selected to be done."
diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index 2eafa34a3..6b1644cef 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -37,14 +37,14 @@ done
 # -- Set up environment --------------------------------------------------------
 # ==============================================================================
 
-command -v /usr/bin/clang++-10 >/dev/null 2>&1 || {
-  echo >&2 "clang 8 is required, but it's not installed.";
+command -v /usr/bin/clang++ >/dev/null 2>&1 || {
+  echo >&2 "clang1is required, but it's not installed.";
   exit 1;
 }
 
 CXX_TAG=c10
-export CC=/usr/bin/clang-10
-export CXX=/usr/bin/clang++-10
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
 
 source $(dirname "$0")/Environment.sh
 
@@ -148,7 +148,7 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
 
     pushd ${BOOST_BASENAME}-source >/dev/null
 
-    BOOST_TOOLSET="clang-8.0"
+    BOOST_TOOLSET="clang"
     BOOST_CFLAGS="-fPIC -std=c++14 -DBOOST_ERROR_CODE_HEADER_ONLY"
 
     py3="/usr/bin/env python${PY_VERSION}"