diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index c887e2297e49..f88d6a378461 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine
+FROM docker-config-engine-stretch
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 
 # Install required packages
-RUN apt-get install -y python-pip libpython2.7 sensord fancontrol ipmitool
+RUN apt-get install -y python-pip libpython2.7 fancontrol ipmitool, librdd8, librrd-dev, rrdtool
 
 {% if docker_platform_monitor_debs.strip() -%}
 # Copy locally-built Debian package dependencies
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index a1000849bc76..d15fd66d6dc1 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -2,13 +2,14 @@
 
 DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
-$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
+$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LM_SENSORS) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_DAEMON_BASE_PY2)
-$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
+$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_STRETCH)
+SONIC_STRETCH_DOCKERS += $(DOCKER_PLATFORM_MONITOR)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)
diff --git a/rules/lm-sensors.mk b/rules/lm-sensors.mk
new file mode 100644
index 000000000000..251a71d3b774
--- /dev/null
+++ b/rules/lm-sensors.mk
@@ -0,0 +1,14 @@
+# lm-senensors package
+
+LM_SENSORS_VERSION=3.4.0
+LM_SENSORS_VERSION_FULL=$(LM_SENSORS_VERSION)-4
+
+LM_SENSORS = lm-sensors_$(LM_SENSORS_VERSION_FULL)_amd64.deb
+$(LM_SENSORS)_SRC_PATH = $(SRC_PATH)/lm-sensors
+
+
+SONIC_MAKE_DEBS += $(LM_SENSORS)
+
+export LM_SENSORS
+export LM_SENSORS_VERSION 
+export LM_SENSORS_VERSION_FULL
diff --git a/sonic-slave-stretch/Dockerfile b/sonic-slave-stretch/Dockerfile
index 9ab24a8151b2..4031e3239f65 100644
--- a/sonic-slave-stretch/Dockerfile
+++ b/sonic-slave-stretch/Dockerfile
@@ -212,7 +212,11 @@ RUN apt-get update && apt-get install -y \
         python3-pytest \
         python3-colorama \
 # For initramfs
-        bash-completion
+        bash-completion \
+# For sensord build
+        librrd8 \
+        librrd-dev\
+        rrdtool
 
 # For linux build
 RUN apt-get -y build-dep linux
diff --git a/src/lm-sensors/Makefile b/src/lm-sensors/Makefile
new file mode 100644
index 000000000000..64d065241243
--- /dev/null
+++ b/src/lm-sensors/Makefile
@@ -0,0 +1,16 @@
+SHELL = /bin/bash
+.ONESHELL:
+	.SHELLFLAGS += -e
+
+
+MAIN_TARGET = $(LM_SENSORS)
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	rm -rf lm-sensors-$(LM_SENSORS_VERSION)
+	dget -u http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.4.0-4.dsc
+	sed -i "/Binary: lm-sensors, libsensors4, libsensors4-dev, fancontrol/c\Binary: lm-sensors, libsensors4, libsensors4-dev, fancontrol, sensord/g" lm-sensors_3.4.0-4.dsc
+	pushd lm-sensors-$(LM_SENSORS_VERSION)
+	DEB_BUILD_OPTIONS=nocheck PROG_EXTRA=sensord dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+	popd
+
+	mv $* $(DEST)/