diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
index 08e9289..3506797 100644
--- a/.github/workflows/kernel-test.yml
+++ b/.github/workflows/kernel-test.yml
@@ -66,4 +66,5 @@ jobs:
           vmlinuz: '${{ github.workspace }}/vmlinuz'
           kernel-root: '.'
           max-cpu: 8
-          kernel-test: ${{ inputs.test }}
\ No newline at end of file
+          kernel-test: ${{ inputs.test }}
+          toolchain: ${{ inputs.toolchain_full }}
diff --git a/.github/workflows/kernel-veristat.yml b/.github/workflows/kernel-veristat.yml
index 1e630cb..3708aa2 100644
--- a/.github/workflows/kernel-veristat.yml
+++ b/.github/workflows/kernel-veristat.yml
@@ -81,6 +81,7 @@ jobs:
           # Don't run meta's veristat from forked repo.
           kernel-test: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'run_veristat_kernel,run_veristat_meta' || 'run_veristat_kernel' }}
           output-dir: '${{ github.workspace }}'
+          toolchain: ${{ inputs.toolchain }}
 
       - name: Compare and save veristat.kernel.csv
         uses: ./.github/actions/veristat_baseline_compare
diff --git a/ci/vmtest/vmtest_selftests.sh b/ci/vmtest/vmtest_selftests.sh
index 500e0b8..aba868b 100755
--- a/ci/vmtest/vmtest_selftests.sh
+++ b/ci/vmtest/vmtest_selftests.sh
@@ -22,6 +22,7 @@ WORKING_DIR="/${PROJECT_NAME}"
 BPF_SELFTESTS_DIR="${WORKING_DIR}/selftests/bpf"
 VMTEST_CONFIGS_PATH="${WORKING_DIR}/ci/vmtest/configs"
 PKG_CONFIG=pkg-config
+TMON_DIR=/tmp/tmon_pcap
 
 read_lists() {
 	(for path in "$@"; do
@@ -190,6 +191,10 @@ echo "TMONLIST: ${TMONLIST}"
 
 cd ${PROJECT_NAME}/selftests/bpf
 
+if [ -d "${TMON_DIR}" ]; then
+    rm -rf "${TMON_DIR}"
+fi
+
 # populate TEST_NAMES
 read_test_names "$@"
 # if we don't have any test name provided to the script, we run all tests.
@@ -206,3 +211,8 @@ else
 		"${test_name}"
 	done
 fi
+
+if [ -d "${TMON_DIR}" ]; then
+    rm -rf "${OUTPUT_DIR}/tmon-logs"
+    mv "${TMON_DIR}" "${OUTPUT_DIR}/tmon-logs"
+fi