diff --git a/Makefile b/Makefile
index 38e90f2bfae..3e2480891b3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ DOCKER_BUILD = docker build --no-cache \
 	    PLATFORM=$(PLATFORM) \
 	    BUILD_NUMBER=$(BUILD_NUMBER) \
 	    ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
+	    PASSWORD=$(PASSWORD) \
+	    USERNAME=$(USERNAME) \
 	    $@
 
 sonic-slave-build :
diff --git a/rules/config b/rules/config
index dcfa40c7459..ca0de68e731 100644
--- a/rules/config
+++ b/rules/config
@@ -26,11 +26,11 @@ SONIC_CONFIG_LOG_TO_FILES = y
 # Comment next line to disable:
 # SONIC_CONFIG_ENABLE_COLORS = y
 
-# USERNAME - username for installer build
-USERNAME = admin
+# DEFAULT_USERNAME - default username for installer build
+DEFAULT_USERNAME = admin
 
-# PASSWORD - password for installer build
-PASSWORD = YourPaSsWoRd
+# DEFAULT_PASSWORD - default password for installer build
+DEFAULT_PASSWORD = YourPaSsWoRd
 
 # ENABLE_DHCP_GRAPH_SERVICE - specify the source of minigraph to generate configuration file.
 # If set to y SONiC will get the minigraph from graph service. Graph service URL need to be 
diff --git a/slave.mk b/slave.mk
index 4f3761aa226..fbfa9f28fa3 100644
--- a/slave.mk
+++ b/slave.mk
@@ -59,6 +59,14 @@ ifneq ($(CONFIGURED_PLATFORM), undefined)
 include $(PLATFORM_PATH)/rules.mk
 endif
 
+ifeq ($(USERNAME),)
+override USERNAME := $(DEFAULT_USERNAME)
+endif
+
+ifeq ($(PASSWORD),)
+override PASSWORD := $(DEFAULT_PASSWORD)
+endif
+
 MAKEFLAGS += -j $(SONIC_CONFIG_BUILD_JOBS)
 
 ###############################################################################