diff --git a/build_debian.sh b/build_debian.sh
index f2f7db2b97..b3d692cdb2 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -113,6 +113,12 @@ sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-language
 ## Note: set lang to prevent locale warnings in your chroot
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y upgrade
+
+echo '[INFO] Install and setup eatmydata'
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install eatmydata
+sudo LANG=C chroot $FILESYSTEM_ROOT ln -s /usr/bin/eatmydata /usr/local/bin/dpkg
+echo 'Dir::Bin::dpkg "/usr/local/bin/dpkg";' | sudo tee $FILESYSTEM_ROOT/etc/apt/apt.conf.d/00image-install-eatmydata > /dev/null
+
 echo '[INFO] Install packages for building image'
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc
 
@@ -586,6 +592,10 @@ scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
 # Remove GCC
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc
 
+# Remove eatmydata
+sudo rm $FILESYSTEM_ROOT/etc/apt/apt.conf.d/00image-install-eatmydata $FILESYSTEM_ROOT/usr/local/bin/dpkg
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove eatmydata
+
 ## Clean up apt
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y autoremove
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean
diff --git a/rules/debootstrap.dep b/rules/debootstrap.dep
new file mode 100644
index 0000000000..82ca11d7e4
--- /dev/null
+++ b/rules/debootstrap.dep
@@ -0,0 +1,10 @@
+
+SPATH       := $($(DEBOOTSTRAP)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/debootstrap.mk rules/debootstrap.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(DEBOOTSTRAP)_CACHE_MODE  := GIT_CONTENT_SHA
+$(DEBOOTSTRAP)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(DEBOOTSTRAP)_DEP_FILES   := $(DEP_FILES)
+
diff --git a/rules/debootstrap.mk b/rules/debootstrap.mk
new file mode 100644
index 0000000000..dc60599d5f
--- /dev/null
+++ b/rules/debootstrap.mk
@@ -0,0 +1,9 @@
+# debootstrap package
+
+DEBOOTSTRAP_VERSION = 1.0.123
+
+export DEBOOTSTRAP_VERSION
+
+DEBOOTSTRAP = debootstrap_$(DEBOOTSTRAP_VERSION)_all.deb
+$(DEBOOTSTRAP)_SRC_PATH = $(SRC_PATH)/debootstrap
+SONIC_MAKE_DEBS += $(DEBOOTSTRAP)
diff --git a/slave.mk b/slave.mk
index 17ee8d8ac8..a68a08fcd5 100644
--- a/slave.mk
+++ b/slave.mk
@@ -992,6 +992,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
         $$(addprefix $(TARGET_PATH)/,$$(SONIC_PACKAGES_LOCAL)) \
         $$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
+        $(addsuffix -install,$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(DEBOOTSTRAP))) \
         $(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SONIC_ZTP))) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_UTILITIES_PY3)) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PY_COMMON_PY2)) \
diff --git a/src/debootstrap/.gitignore b/src/debootstrap/.gitignore
new file mode 100644
index 0000000000..2aa8324ad6
--- /dev/null
+++ b/src/debootstrap/.gitignore
@@ -0,0 +1,3 @@
+debootstrap*.udeb
+debootstrap*.dsc
+debootstrap-*/
diff --git a/src/debootstrap/Makefile b/src/debootstrap/Makefile
new file mode 100644
index 0000000000..04e8646a1b
--- /dev/null
+++ b/src/debootstrap/Makefile
@@ -0,0 +1,24 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+MAIN_TARGET = debootstrap_$(DEBOOTSTRAP_VERSION)_all.deb
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Remove any stale files
+	rm -rf ./debootstrap-$(DEBOOTSTRAP_VERSION) ./debootstrap*.{deb,udeb,dsc}
+
+	# Get source package
+	dget https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_$(DEBOOTSTRAP_VERSION).dsc
+
+	# Build source and Debian packages
+	pushd debootstrap-$(DEBOOTSTRAP_VERSION)
+	patch -p1 -i ../proc-mount.patch
+	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	popd
+
+	# Move the newly-built .deb packages to the destination directory
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
+
diff --git a/src/debootstrap/proc-mount.patch b/src/debootstrap/proc-mount.patch
new file mode 100644
index 0000000000..9308457649
--- /dev/null
+++ b/src/debootstrap/proc-mount.patch
@@ -0,0 +1,34 @@
+From 87cdebbcad6f4e16ba711227cbbbd70039f88752 Mon Sep 17 00:00:00 2001
+From: YunQiang Su <syq@debian.org>
+Date: Mon, 7 Sep 2020 09:29:37 +0800
+Subject: [PATCH] stage1: re-mkdir /proc instead of umount if it is a symlink
+
+In docker, the TARGET/proc will be a symlink to /proc.
+And if the docker instance is called with --privileged, it will umount
+the /proc of the whole instance in setup_proc.
+---
+ debian/changelog | 3 +++
+ functions        | 7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/functions b/functions
+index 1ac63f7..065320d 100644
+--- a/functions
++++ b/functions
+@@ -1183,7 +1183,12 @@ setup_proc () {
+ 		umount_on_exit /dev/shm
+ 		umount_on_exit /proc
+ 		umount_on_exit /proc/bus/usb
+-		umount "$TARGET/proc" 2>/dev/null || true
++		if [ -L "$TARGET/proc" ];then
++			rm -f $TARGET/proc
++			mkdir $TARGET/proc
++		else
++			umount "$TARGET/proc" 2>/dev/null || true
++		fi
+ 
+ 		# some container environment are used at second-stage, it already treats /proc and so on
+ 		if [ -z "$(ls -A "$TARGET/proc")" ]; then
+-- 
+GitLab
+