diff --git a/slave.mk b/slave.mk
index 92c5afbe24..86f2842427 100644
--- a/slave.mk
+++ b/slave.mk
@@ -455,7 +455,7 @@ export vs_build_prepare_mem=$(VS_PREPARE_MEM)
 # $(1) => Docker name
 
 define docker-get-tag
-$(shell [ ! -z $(filter $(1).gz,$(SONIC_PACKAGES_LOCAL)) ] && echo $(SONIC_IMAGE_VERSION) || echo latest)
+$(shell [ ! -z $(filter $(1).gz,$(SONIC_PACKAGES_LOCAL)) ] && [ x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) == x"y" ] && echo $(SONIC_IMAGE_VERSION) || echo latest)
 endef
 
 # $(call docker-image-save,from,to)