diff --git a/make/config.mk b/make/config.mk
index 508734e3..c660b881 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -19,7 +19,7 @@ endif
 #
 # The default build directory for all infra:builder compilations is the following.
 #
-export BUILD_DIR_BASE=BUILD
+export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE)
 
 
 # Generate manifest if necessary
@@ -31,6 +31,3 @@ export MODULEMANIFEST := $(shell $(ONL)/tools/scripts/manifest.sh $(ONL) $(BUILD
 ONL_MAKE_FLAGS += --no-print-directory -s
 ONL_MAKE := $(MAKE) $(ONL_MAKE_FLAGS)
 ONL_V_at := @
-
-
-