diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 1466fe5..773f014 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -761,10 +761,10 @@
     git \
     dbus \
     iputils-ping \
-    clang-10 \
-    clang-format-10 \
-    clang-tidy-10 \
-    clang-tools-10 \
+    clang-11 \
+    clang-format-11 \
+    clang-tidy-11 \
+    clang-tools-11 \
     shellcheck \
     npm \
     iproute2 \
@@ -798,11 +798,12 @@
   --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
   --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
 
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 1000 \
-  --slave /usr/bin/clang++ clang++ /usr/bin/clang++-10 \
-  --slave /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-10 \
-  --slave /usr/bin/clang-format clang-format /usr/bin/clang-format-10 \
-  --slave /usr/bin/run-clang-tidy.py run-clang-tidy.py /usr/bin/run-clang-tidy-10.py
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 1000 \
+  --slave /usr/bin/clang++ clang++ /usr/bin/clang++-11 \
+  --slave /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-11 \
+  --slave /usr/bin/clang-format clang-format /usr/bin/clang-format-11 \
+  --slave /usr/bin/run-clang-tidy.py run-clang-tidy.py /usr/bin/run-clang-tidy-11.py \
+  --slave /usr/bin/scan-build scan-build /usr/bin/scan-build-11
 
 """
 
diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 4da2174..d8ef389 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -39,7 +39,7 @@
 done
 
 # Allow called scripts to know which clang format we are using
-export CLANG_FORMAT="clang-format-10"
+export CLANG_FORMAT="clang-format"
 IGNORE_FILE=".clang-ignore"
 declare -a IGNORE_LIST