diff --git a/scripts/wait_for_docker.sh b/scripts/wait_for_docker.sh
new file mode 100755
index 000000000000..744646732826
--- /dev/null
+++ b/scripts/wait_for_docker.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+total_time=$1
+cnt=0
+while [ $cnt -le $total_time ]; do
+    docker info 1>/dev/null
+    rv=$?
+    if [ $rv -eq 0 ]; then
+        exit 0
+    fi
+    sleep 1
+    cnt=$((cnt+1))
+done
+
+exit 1
diff --git a/slave.mk b/slave.mk
index 1174cb148949..05285971af58 100644
--- a/slave.mk
+++ b/slave.mk
@@ -454,7 +454,7 @@ $(SONIC_INSTALL_WHEELS) : $(PYTHON_WHEELS_PATH)/%-install : .platform $$(addsuff
 docker-start :
 	@sudo sed -i '/http_proxy/d' /etc/default/docker
 	@sudo bash -c "echo \"export http_proxy=$$http_proxy\" >> /etc/default/docker"
-	@test x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) != x"y" && sudo service docker status &> /dev/null || ( sudo service docker start &> /dev/null && sleep 1 )
+	@test x$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) != x"y" && sudo service docker status &> /dev/null || ( sudo service docker start &> /dev/null && ./scripts/wait_for_docker.sh 60 )
 
 # targets for building simple docker images that do not depend on any debian packages
 $(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform docker-start $$(addsuffix -load,$$(addprefix $(TARGET_PATH)/,$$($$*.gz_LOAD_DOCKERS)))