diff --git a/setup.env b/setup.env
index ca010660..bbe964a8 100755
--- a/setup.env
+++ b/setup.env
@@ -20,7 +20,7 @@ export PATH="$ONL/tools/scripts:$ONL/tools:$PATH"
 
 # Parallel Make Jobs
 # Default parallel build settings
-# export MAKEFLAGS="-j64"
+export ONL_MAKE_PARALLEL=-j16
 
 # Version files
 $ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make