diff --git a/config/boards/README.md b/config/boards/README.md
index 3bb8d0ba78..e5f116e475 100644
--- a/config/boards/README.md
+++ b/config/boards/README.md
@@ -10,9 +10,11 @@
 | BOOTFS_TYPE | boot partition type: ext4, fat |
 | DEFAULT_OVERLAYS | usbhost1 usbhost2 ... |
 | DEFAULT_CONSOLE | serial = change default boot output |
+| MODULES | space delimited modules for all branches |
 | MODULES_LEGACY | space delimited modules for legacy branch |
 | MODULES_CURRENT | space delimited modules for current branch |
 | MODULES_DEV | space delimited modules for dev branch |
+| MODULES_BLACKLIST | space delimited modules blacklist for all branches |
 | MODULES_BLACKLIST_LEGACY | space delimited modules blacklist for legacy branch |
 | MODULES_BLACKLIST_CURRENT | space delimited modules blacklist for current branch |
 | MODULES_BLACKLIST_DEV | space delimited modules blacklist for dev branch |
diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh
index d802cdfb47..dd1f648832 100644
--- a/lib/build-all-ng.sh
+++ b/lib/build-all-ng.sh
@@ -266,8 +266,8 @@ function build_all()
 
 		unset_all
 		# unset also board related variables
-		unset BOARDFAMILY DESKTOP_AUTOLOGIN DEFAULT_CONSOLE FULL_DESKTOP MODULES_CURRENT MODULES_LEGACY MODULES_DEV \
-		BOOTCONFIG MODULES_BLACKLIST_LEGACY MODULES_BLACKLIST_CURRENT MODULES_BLACKLIST_DEV DEFAULT_OVERLAYS SERIALCON \
+		unset BOARDFAMILY DESKTOP_AUTOLOGIN DEFAULT_CONSOLE FULL_DESKTOP MODULES MODULES_CURRENT MODULES_LEGACY MODULES_DEV \
+		BOOTCONFIG MODULES_BLACKLIST MODULES_BLACKLIST_LEGACY MODULES_BLACKLIST_CURRENT MODULES_BLACKLIST_DEV DEFAULT_OVERLAYS SERIALCON \
 		BUILD_MINIMAL RELEASE ATFBRANCH BOOT_FDT_FILE BOOTCONFIG_DEV
 
 		read -r BOARD BRANCH RELEASE BUILD_TARGET BUILD_STABILITY BUILD_IMAGE <<< "${line}"