diff --git a/Makefile.work b/Makefile.work
index 37ee2e1152..b81ac59124 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -74,11 +74,11 @@ endif
 ifeq ($(BLDENV), stretch)
 SLAVE_DIR = sonic-slave-stretch
 else
-SLAVE_DIR = sonic-slave
+SLAVE_DIR = sonic-slave-jessie
 endif
 SLAVE_BASE_TAG = $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile && sha1sum $(SLAVE_DIR)/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
-SLAVE_BASE_IMAGE = $(SLAVE_DIR)-base
+SLAVE_BASE_IMAGE = $(SLAVE_DIR)
 SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER)
 
 OVERLAY_MODULE_CHECK := \
diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave-jessie/Dockerfile.j2
similarity index 100%
rename from sonic-slave/Dockerfile.j2
rename to sonic-slave-jessie/Dockerfile.j2
diff --git a/sonic-slave/Dockerfile.user b/sonic-slave-jessie/Dockerfile.user
similarity index 93%
rename from sonic-slave/Dockerfile.user
rename to sonic-slave-jessie/Dockerfile.user
index 253475b218..37dd7256c4 100644
--- a/sonic-slave/Dockerfile.user
+++ b/sonic-slave-jessie/Dockerfile.user
@@ -1,5 +1,5 @@
 ARG slave_base_tag_ref=latest
-FROM sonic-slave-base:${slave_base_tag_ref}
+FROM sonic-slave-jessie:${slave_base_tag_ref}
 
 # Add user
 ARG user
diff --git a/sonic-slave/sonic-jenkins-id_rsa.pub b/sonic-slave-jessie/sonic-jenkins-id_rsa.pub
similarity index 100%
rename from sonic-slave/sonic-jenkins-id_rsa.pub
rename to sonic-slave-jessie/sonic-jenkins-id_rsa.pub
diff --git a/sonic-slave-stretch/Dockerfile.user b/sonic-slave-stretch/Dockerfile.user
index 1e5b914143..87e4d9568b 100644
--- a/sonic-slave-stretch/Dockerfile.user
+++ b/sonic-slave-stretch/Dockerfile.user
@@ -1,5 +1,5 @@
 ARG slave_base_tag_ref=latest
-FROM sonic-slave-stretch-base:${slave_base_tag_ref}
+FROM sonic-slave-stretch:${slave_base_tag_ref}
 
 # Add user
 ARG user