diff --git a/build-coredistools.sh b/build-coredistools.sh
index 42d6e65b..be65cd6a 100755
--- a/build-coredistools.sh
+++ b/build-coredistools.sh
@@ -35,19 +35,25 @@ fi
 
 C_COMPILER=$(command -v clang)
 if [ -z "$C_COMPILER" ]; then
-    C_COMPILER=$(command -v clang-9)
+    C_COMPILER=$(command -v clang-10)
     if [ -z "$C_COMPILER" ]; then
-        echo "C compiler not found"
-	# Keep going in case cmake can find one?
+        C_COMPILER=$(command -v clang-9)
+        if [ -z "$C_COMPILER" ]; then
+            echo "C compiler not found"
+            # Keep going in case cmake can find one?
+        fi
     fi
 fi
 
 CXX_COMPILER=$(command -v clang++)
 if [ -z "$CXX_COMPILER" ]; then
-    CXX_COMPILER=$(command -v clang++-9)
+    CXX_COMPILER=$(command -v clang++-10)
     if [ -z "$CXX_COMPILER" ]; then
-        echo "C++ compiler not found"
-	# Keep going in case cmake can find one?
+        CXX_COMPILER=$(command -v clang++-9)
+        if [ -z "$CXX_COMPILER" ]; then
+            echo "C++ compiler not found"
+            # Keep going in case cmake can find one?
+        fi
     fi
 fi
 
diff --git a/coredistools.yml b/coredistools.yml
index d251a71e..dcfd8a33 100644
--- a/coredistools.yml
+++ b/coredistools.yml
@@ -90,7 +90,7 @@ jobs:
   pool:
     # CBL-Mariner:
     # vmImage: ubuntu-latest
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   workspace:
     clean: all
@@ -178,7 +178,7 @@ jobs:
   displayName: Build coredistools Linux x64
 
   pool:
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-20.04
 
   variables:
     TargetOSArchitecture: linux-x64