diff --git a/script/build_package.sh b/script/build_package.sh
index 80b58b6..d13d24b 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -502,6 +502,13 @@
 		set +a
 	fi
 
+	if is_arm_jenkins_env || upon "$local_ci"; then
+		path_list=(
+			"$llvm_dir/bin"
+		)
+		extend_path "PATH" "path_list"
+	fi
+
 	cd "$tf_root"
 
 	# Always distclean when running on Jenkins. Skip distclean when running
diff --git a/script/tf-coverity/common-def.sh b/script/tf-coverity/common-def.sh
index 5d2cf13..82f391e 100644
--- a/script/tf-coverity/common-def.sh
+++ b/script/tf-coverity/common-def.sh
@@ -65,10 +65,11 @@
 
 # Provide correct armclang toolchain based on environment
 set_armclang_toolchain() {
-    local armclang_path="/home/buildslave/tools/armclang-6.8/bin"
+    # FIXME: ARMCompiler 6.18 is symlinked to 6.17 until it is available on OpenCI.
+    local armclang_path="/home/buildslave/tools/armclang-6.17/bin"
 
     # if under arm enviroment, overide cross-compilation path
-    is_arm_jenkins_env || upon "$local_ci" && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.8/25/standalone-linux-x86_64-rel/bin"
+    is_arm_jenkins_env || upon "$local_ci" && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.18/19/standalone-linux-x86_64-rel/bin"
 
     echo "${armclang_path}/armclang"
 }