diff --git a/Jenkinsfile b/Jenkinsfile
index 33b16f3..de8dcd5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,9 +21,10 @@
 // Jenkins pipeline
 // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/
 
-ci_lint = "tvmai/ci-lint:v0.51"
-ci_cpu = "tvmai/ci-cpu:v0.55"
-ci_i386 = "tvmai/ci-i386:v0.52"
+ci_lint = "tlcpack/ci-lint:v0.67"
+ci_cpu = "tlcpack/ci-cpu:v0.77"
+ci_i386 = "tlcpack/ci-i386:v0.73"
+
 
 // command to start a docker container
 // NOTE: docker container provides an extra layer of isolation
diff --git a/hardware/intelfocl/README.rst b/hardware/intelfocl/README.rst
index cedd697..fafe480 100644
--- a/hardware/intelfocl/README.rst
+++ b/hardware/intelfocl/README.rst
@@ -1,3 +1,20 @@
+<!--- Licensed to the Apache Software Foundation (ASF) under one -->
+<!--- or more contributor license agreements.  See the NOTICE file -->
+<!--- distributed with this work for additional information -->
+<!--- regarding copyright ownership.  The ASF licenses this file -->
+<!--- to you under the Apache License, Version 2.0 (the -->
+<!--- "License"); you may not use this file except in compliance -->
+<!--- with the License.  You may obtain a copy of the License at -->
+
+<!---   http://www.apache.org/licenses/LICENSE-2.0 -->
+
+<!--- Unless required by applicable law or agreed to in writing, -->
+<!--- software distributed under the License is distributed on an -->
+<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
+<!--- KIND, either express or implied.  See the License for the -->
+<!--- specific language governing permissions and limitations -->
+<!--- under the License. -->
+
 Intel OpenCL for FPGA Setup
 ---------------------------
 
diff --git a/tests/scripts/task_tvm_config_build_cpu.sh b/tests/scripts/task_tvm_config_build_cpu.sh
index e1c2126..a97ce72 100755
--- a/tests/scripts/task_tvm_config_build_cpu.sh
+++ b/tests/scripts/task_tvm_config_build_cpu.sh
@@ -26,10 +26,8 @@
 echo set\(USE_SORT ON\) >> config.cmake
 echo set\(USE_MICRO ON\) >> config.cmake
 echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
-echo set\(USE_GRAPH_RUNTIME_DEBUG ON\) >> config.cmake
-echo set\(USE_VM_PROFILER ON\) >> config.cmake
-echo set\(USE_EXAMPLE_EXT_RUNTIME ON\) >> config.cmake
-echo set\(USE_LLVM llvm-config-8\) >> config.cmake
+echo set\(USE_PROFILER ON\) >> config.cmake
+echo set\(USE_LLVM llvm-config-11\) >> config.cmake
 echo set\(USE_NNPACK ON\) >> config.cmake
 echo set\(NNPACK_PATH /NNPACK/build/\) >> config.cmake
 echo set\(USE_ANTLR ON\) >> config.cmake
diff --git a/tests/scripts/task_tvm_cpptest.sh b/tests/scripts/task_tvm_cpptest.sh
index bd8ea77..e067b77 100755
--- a/tests/scripts/task_tvm_cpptest.sh
+++ b/tests/scripts/task_tvm_cpptest.sh
@@ -25,10 +25,16 @@
 
 export LD_LIBRARY_PATH="lib:${LD_LIBRARY_PATH:-}"
 
-# Remove existing testcases
-rm -f build/*_test
+# to avoid CI thread throttling.
+export TVM_BIND_THREADS=0
+export OMP_NUM_THREADS=1
 
-make cpptest -j8
-for test in build/*_test; do
-    ./$test
-done
+# Build cpptest suite
+make cpptest -j2
+
+# "make crttest" requires USE_MICRO to be enabled, which is not always the case.
+if grep crttest build/Makefile > /dev/null; then
+    make crttest  # NOTE: don't parallelize, due to issue with build deps.
+fi
+
+cd build && ctest --gtest_death_test_style=threadsafe && cd ..