diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index c3d41152..0512391d 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -44,13 +44,6 @@ echo "----------------------------------------"
 	echo "----------------------------------------"
 
 	# Run the fuzzers
-	#
-	# Cap MAX_VIVADO_PROCESS at 20 to limit memory usage of 074 fuzzer.
-	# At MAX_VIVADO_PROCESS=20:
-	# - 072 completes in ~35 minutes
-	# - 074 completes in ~60 minutes
-	# which is well before the 05x INT fuzzers complete.
-	export MAX_VIVADO_PROCESS=$((CORES/2 < 20 ? CORES/2 : 20))
 	set -x +e
 	tmp=`mktemp`
 	script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$MAX_VIVADO_PROCESS db-${XRAY_SETTINGS}-all" $tmp
diff --git a/.github/kokoro/steps/hostinfo.sh b/.github/kokoro/steps/hostinfo.sh
index b0042f8a..f55cb432 100755
--- a/.github/kokoro/steps/hostinfo.sh
+++ b/.github/kokoro/steps/hostinfo.sh
@@ -24,8 +24,9 @@ export MEM_GB=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo)/(1024*1024)))
 echo "Total Memory (GB): $MEM_GB"
 
 # Approx memory per grid process
-export MEM_PER_GRID=8
+export MEM_PER_RUN=8
 export MAX_CPU_PER_GRID=$(($MEM_GB/$MEM_PER_RUN))
+export MAX_VIVADO_PROCESS=$(($MEM_GB/$MEM_PER_RUN))
 
 echo
 echo "========================================"