diff --git a/Makefile b/Makefile
index 942026aa2..e02a5414d 100644
--- a/Makefile
+++ b/Makefile
@@ -63,16 +63,6 @@ else
   endif
 endif
 
-BOARD ?= kbl-nuc-i7
-
-ifeq ($(BOARD), apl-nuc)
-  override BOARD := nuc6cayh
-else ifeq ($(BOARD), kbl-nuc-i7)
-  override BOARD := nuc7i7dnb
-endif
-
-SCENARIO ?= industry
-
 O ?= build
 ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd)
 HV_OUT := $(ROOT_OUT)/hypervisor
diff --git a/hypervisor/scripts/makefile/config.mk b/hypervisor/scripts/makefile/config.mk
index 323a3be09..3b08de168 100644
--- a/hypervisor/scripts/makefile/config.mk
+++ b/hypervisor/scripts/makefile/config.mk
@@ -141,6 +141,13 @@ ifdef RELEASE
   endif
 endif
 
+# Backward-compatibility for BOARD=apl-nuc or BOARD=kbl-nuc
+ifeq ($(BOARD), apl-nuc)
+  override BOARD := nuc6cayh
+else ifeq ($(BOARD), kbl-nuc-i7)
+  override BOARD := nuc7i7dnb
+endif
+
 ifeq ($(findstring $(MAKECMDGOALS),distclean),)
 -include $(HV_CONFIG_MK)
 endif
@@ -181,7 +188,7 @@ endif
 
 $(eval $(call determine_config,BOARD,nuc7i7dnb))
 $(eval $(call determine_config,SCENARIO,industry))
-$(eval $(call determine_build_type,y))
+$(eval $(call determine_build_type,n))
 
 $(HV_BOARD_XML):
 	@if [ ! -f $(HV_BOARD_XML) ]; then \