diff --git a/.github/kokoro/database.cfg b/.github/kokoro/database.cfg
index c904160c..ebc11d87 100644
--- a/.github/kokoro/database.cfg
+++ b/.github/kokoro/database.cfg
@@ -6,6 +6,8 @@ action {
   define_artifacts {
     regex: "**/*result*.xml"
     regex: "**/build/*.log"
+    regex: "**/logs/*.log"
+    regex: "**/logs/*.xml"
     regex: "**/build/**"
     regex: "**/diff.*"
     regex: "**/database/**"
diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index 905aa201..03c31b37 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -46,9 +46,9 @@ echo "----------------------------------------"
 	echo "----------------------------------------"
 
 	# Run the fuzzers
-	export MAX_VIVADO_PROCESS=$CORES
+	export MAX_VIVADO_PROCESS=$((CORES/2 < 20 ? CORES/2 : 20))
 	set -x
-	script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$CORES" -
+	script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$MAX_VIVADO_PROCESS" -
 	set +x
 	echo "----------------------------------------"