diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a0cab0d4..1062ddc35 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,17 +19,6 @@ commands:
             HOMEBREW_NO_AUTO_UPDATE=1 brew tap bell-sw/liberica
             HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask liberica-jdk8
 
-  install-clang-10:
-    steps:
-      - run:
-          name: Install Clang 10
-          command: |
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
-            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
-            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
-            sudo apt-get update -y && sudo apt-get install -y clang-10
-
   increase-max-open-files-on-macos:
     steps:
       - run:
@@ -140,6 +129,28 @@ commands:
             sudo apt remove --purge cmake
             sudo snap install cmake --classic
 
+  install-clang-10:
+    steps:
+      - run:
+          name: Install Clang 10
+          command: |
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            sudo apt-get update -y && sudo apt-get install -y clang-10
+
+  install-clang-13:
+    steps:
+      - run:
+          name: Install Clang 13
+          command: |
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+            sudo apt-get update -y && sudo apt-get install -y clang-13
+
   install-gflags:
     steps:
       - run:
@@ -512,6 +523,7 @@ jobs:
     resource_class: xlarge
     steps:
       - pre-steps
+      - run: sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
       - run: CC=gcc-8 CXX=g++-8 V=1 make -j16 all
       - post-steps
 
@@ -536,6 +548,7 @@ jobs:
     resource_class: xlarge
     steps:
       - pre-steps
+      - run: sudo apt-get update -y && sudo apt-get install gcc-10 g++-10 libgflags-dev
       - run: CC=gcc-10 CXX=g++-10 V=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all
       - post-steps
 
@@ -545,6 +558,7 @@ jobs:
     resource_class: xlarge
     steps:
       - pre-steps
+      - run: sudo apt-get update -y && sudo apt-get install gcc-11 g++-11 libgflags-dev
       - run: LIB_MODE=static CC=gcc-11 CXX=g++-11 V=1 make -j16 all microbench # TODO: LIB_MODE only to work around unresolved linker failures
       - post-steps
 
@@ -554,6 +568,7 @@ jobs:
     resource_class: xlarge
     steps:
       - pre-steps
+      - install-clang-13
       - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all microbench
       - post-steps
 
@@ -566,6 +581,7 @@ jobs:
       - pre-steps
       - setup-folly
       - build-folly
+      - install-clang-13
       - run: CC=clang-13 CXX=clang++-13 LIB_MODE=static USE_CLANG=1 USE_FOLLY=1 COMPILE_WITH_UBSAN=1 COMPILE_WITH_ASAN=1 make -j16 check # TODO: LIB_MODE only to work around unresolved linker failures
       - post-steps
 
@@ -896,6 +912,7 @@ jobs:
     resource_class: large
     steps:
       - pre-steps
+      - install-clang-13
       - run:
           name: "Build rocksdb lib"
           command: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j4 static_lib