diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index 8dbd108..85762f0 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -11,7 +11,7 @@
 set -uo pipefail
 
 DOCKER_IMG_NAME=${1:-"openbmc/ubuntu-unit-test"}
-DISTRO=${2:-"ubuntu:artful"}
+DISTRO=${2:-"ubuntu:bionic"}
 
 # Disable autom4te cache as workaround to permission issue
 AUTOM4TE_CFG="/root/.autom4te.cfg"
@@ -98,7 +98,7 @@
     git \
     dbus \
     iputils-ping \
-    clang-format-5.0 \
+    clang-format-6.0 \
     iproute2 \
     libnl-3-dev \
     libnl-genl-3-dev \
diff --git a/run-unit-test-docker.sh b/run-unit-test-docker.sh
index a67bb40..ef9b4c5 100755
--- a/run-unit-test-docker.sh
+++ b/run-unit-test-docker.sh
@@ -11,7 +11,7 @@
 
 # Default variables
 DOCKER_IMG_NAME="openbmc/ubuntu-unit-test"
-DISTRO=${DISTRO:-ubuntu:artful}
+DISTRO=${DISTRO:-ubuntu:bionic}
 WORKSPACE=${WORKSPACE:-$(mktemp -d --tmpdir unit-test.XXXXXX)}
 OBMC_BUILD_SCRIPTS="openbmc-build-scripts"
 UNIT_TEST_PY_DIR="scripts"
diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 42be8ec..b666ebe 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -26,7 +26,7 @@
 
 if [ -f ".clang-format" ]; then
   find . -regextype sed -regex ".*\.[hc]\(pp\)\?" -not -name "*mako*" -print0 |\
-     xargs -0 "clang-format-5.0" -i
+     xargs -0 "clang-format-6.0" -i
   git --no-pager diff --exit-code
 fi