diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index 380da05..c3d8198 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -216,10 +216,10 @@
     git \
     dbus \
     iputils-ping \
-    clang-8 \
-    clang-format-8 \
-    clang-tidy-8 \
-    clang-tools-8 \
+    clang-10 \
+    clang-format-10 \
+    clang-tidy-10 \
+    clang-tools-10 \
     npm \
     iproute2 \
     libnl-3-dev \
@@ -252,10 +252,6 @@
 RUN pip3 install jsonschema
 RUN pip3 install meson==0.53.2
 
-# run-clang-tidy-8.py has not moved to python3 yet however it
-# supports it for our needs to just switch it over
-RUN sed -i '1s/python$/python3/' /usr/bin/run-clang-tidy-8.py
-
 FROM openbmc-base as openbmc-lcov
 RUN curl -L https://github.com/linux-test-project/lcov/archive/${PKG_REV['lcov']}.tar.gz | tar -xz && \
 cd lcov-* && \
diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 762ea31..dc378f8 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -25,7 +25,7 @@
 fi
 
 # Allow called scripts to know which clang format we are using
-export CLANG_FORMAT="clang-format-8"
+export CLANG_FORMAT="clang-format-10"
 IGNORE_FILE=".clang-ignore"
 declare -a IGNORE_LIST
 
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 05bec87..95021cb 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -730,7 +730,7 @@
             return
 
         if os.path.isfile('.clang-tidy'):
-            check_call_cmd('run-clang-tidy-8.py', '-p', '.')
+            check_call_cmd('run-clang-tidy-10.py', '-p', '.')
         maybe_make_valgrind()
         maybe_make_coverage()
         run_cppcheck()
@@ -893,7 +893,7 @@
 
         # Run clang-tidy only if the project has a configuration
         if os.path.isfile('.clang-tidy'):
-            check_call_cmd('run-clang-tidy-8.py', '-p',
+            check_call_cmd('run-clang-tidy-10.py', '-p',
                            'build')
         # Run the basic clang static analyzer otherwise
         else: