diff --git a/setup.env b/setup.env
index 43ecfa57..eea3c058 100755
--- a/setup.env
+++ b/setup.env
@@ -10,7 +10,7 @@
 export ONL=$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)
 
 # The ONL package dir is here:
-export ONLPM_OPTION_PACKAGEDIRS="$ONL/packages"
+export ONLPM_OPTION_PACKAGEDIRS="$ONL/packages:$ONL/builds"
 
 # The ONL repo dir is here:
 export ONLPM_OPTION_REPO="$ONL/REPO"
@@ -29,6 +29,9 @@ $ONL/tools/submodules.py $ONL sm/bigcode
 # Version files
 $ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make
 
+# Make version values available in the package environment
+export ONLPM_OPTION_INCLUDE_ENV_JSON="$ONL/make/version-onl.json"
+
 #
 # buildroot download mirror. We suggest you setup a local repository containing these contents for faster local builds.
 #