diff --git a/script/tf-coverity/common-def.sh b/script/tf-coverity/common-def.sh
index bec96fc..cff0481 100644
--- a/script/tf-coverity/common-def.sh
+++ b/script/tf-coverity/common-def.sh
@@ -65,10 +65,10 @@
 
 # Provide correct armclang toolchain based on environment
 set_armclang_toolchain() {
-    local armclang_path="/home/buildslave/tools/armclang-6.18/bin"
+    local armclang_path="/home/buildslave/tools/armclang-6.23/bin"
 
     # if under arm enviroment, overide cross-compilation path
-    is_arm_jenkins_env || upon "$local_ci" && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.18/19/standalone-linux-x86_64-rel/bin"
+    is_arm_jenkins_env || upon "$local_ci" && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.23/37/standalone-linux-x86_64-rel/bin"
 
     echo "${armclang_path}/armclang"
 }
diff --git a/tf_config/fvp-default-armclang b/tf_config/fvp-default-armclang
index 161899e..fb78f10 100644
--- a/tf_config/fvp-default-armclang
+++ b/tf_config/fvp-default-armclang
@@ -1,3 +1,3 @@
-CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.18/19/standalone-linux-x86_64-rel/bin/armclang
+CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.23/37/standalone-linux-x86_64-rel/bin/armclang
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
diff --git a/tf_config/juno-default-armclang b/tf_config/juno-default-armclang
index 61f1622..8b58280 100644
--- a/tf_config/juno-default-armclang
+++ b/tf_config/juno-default-armclang
@@ -1,3 +1,3 @@
-CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.18/19/standalone-linux-x86_64-rel/bin/armclang
+CC=/arm/warehouse/Distributions/FA/ARMCompiler/6.23/37/standalone-linux-x86_64-rel/bin/armclang
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=juno