diff --git a/dockers/docker-ptf-saithrift/Dockerfile b/dockers/docker-ptf-saithrift/Dockerfile
deleted file mode 100644
index 0aa49475771..00000000000
--- a/dockers/docker-ptf-saithrift/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM docker-ptf
-
-## Make apt-get non-interactive
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update
-
-COPY ["deps/saithrift-0.9.tar.gz", "/deps/"]
-COPY ["*.ini", "/etc/ptf/"]
-COPY ["deps/SAI/test/saithrift/tests/*", "/usr/share/ptf-tests/"]
-
-RUN tar xzf /deps/saithrift-0.9.tar.gz -C /usr/share/; \
-    cd usr/share/saithrift-0.9;   \
-    python setup.py install;      \
-    rm -rf /deps
diff --git a/dockers/docker-ptf-saithrift/Dockerfile.j2 b/dockers/docker-ptf-saithrift/Dockerfile.j2
new file mode 100644
index 00000000000..3076de4878b
--- /dev/null
+++ b/dockers/docker-ptf-saithrift/Dockerfile.j2
@@ -0,0 +1,17 @@
+FROM docker-ptf
+
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY \
+{% for deb in docker_ptf_saithrift_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
+RUN dpkg -i \
+{% for deb in docker_ptf_saithrift_debs.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+COPY ["*.ini", "/etc/ptf/"]
diff --git a/platform/broadcom/docker-ptf-brcm.mk b/platform/broadcom/docker-ptf-brcm.mk
new file mode 100644
index 00000000000..7b78aa9ec31
--- /dev/null
+++ b/platform/broadcom/docker-ptf-brcm.mk
@@ -0,0 +1,7 @@
+# docker image for docker-ptf-brcm
+
+DOCKER_PTF_BRCM = docker-ptf-brcm.gz
+$(DOCKER_PTF_BRCM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
+$(DOCKER_PTF_BRCM)_DEPENDS += $(PYTHON_SAITHRIFT_BRCM)
+$(DOCKER_PTF_BRCM)_LOAD_DOCKERS += $(DOCKER_PTF)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF_BRCM)
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
index fff132c1c50..18ba86d1c0c 100755
--- a/platform/broadcom/rules.mk
+++ b/platform/broadcom/rules.mk
@@ -11,6 +11,7 @@ include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/one-aboot.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
+include $(PLATFORM_PATH)/docker-ptf-brcm.mk
 
 BCMCMD = bcmcmd
 $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/20170518/bcmcmd?sv=2015-04-05&sr=b&sig=OCW4mfmbQ6D0BH8nllpAWrS8XL9uczrw32w3XgL4jws%3D&se=2030-03-31T23%3A06%3A15Z&sp=r"
@@ -22,6 +23,7 @@ SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
              $(DOCKER_FPM) \
+             $(DOCKER_PTF_BRCM) \
              $(DOCKER_SYNCD_BRCM_RPC)
 
 # Inject brcm sai into sairedis
diff --git a/platform/cavium/docker-ptf-cavm.mk b/platform/cavium/docker-ptf-cavm.mk
new file mode 100644
index 00000000000..4665345586a
--- /dev/null
+++ b/platform/cavium/docker-ptf-cavm.mk
@@ -0,0 +1,7 @@
+# docker image for docker-ptf-cavm
+
+DOCKER_PTF_CAVM = docker-ptf-cavm.gz
+$(DOCKER_PTF_CAVM)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
+$(DOCKER_PTF_CAVM)_DEPENDS += $(PYTHON_SAITHRIFT_CAVM)
+$(DOCKER_PTF_CAVM)_LOAD_DOCKERS += $(DOCKER_PTF)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF_CAVM)
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
index 6eeffbc7f9b..67a69168e03 100644
--- a/platform/cavium/rules.mk
+++ b/platform/cavium/rules.mk
@@ -7,9 +7,11 @@ include $(PLATFORM_PATH)/cavm-xpnet.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
+include $(PLATFORM_PATH)/docker-ptf-cavm.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM) \
+             $(DOCKER_PTF_CAVM) \
              $(DOCKER_SYNCD_CAVM_RPC)
 
 # Inject cavium sai into sairedis
diff --git a/platform/centec/docker-ptf-centec.mk b/platform/centec/docker-ptf-centec.mk
new file mode 100644
index 00000000000..ff84ed0becb
--- /dev/null
+++ b/platform/centec/docker-ptf-centec.mk
@@ -0,0 +1,7 @@
+# docker image for docker-ptf-centec
+
+DOCKER_PTF_CENTEC = docker-ptf-centec.gz
+$(DOCKER_PTF_CENTEC)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
+$(DOCKER_PTF_CENTEC)_DEPENDS += $(PYTHON_SAITHRIFT_CENTEC)
+$(DOCKER_PTF_CENTEC)_LOAD_DOCKERS += $(DOCKER_PTF)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF_CENTEC)
diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk
index 0dcf050fe41..8b676f87ece 100644
--- a/platform/centec/rules.mk
+++ b/platform/centec/rules.mk
@@ -6,8 +6,10 @@ include $(PLATFORM_PATH)/docker-syncd-centec-rpc.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
+include $(PLATFORM_PATH)/docker-ptf-centec.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
+             $(DOCKER_PTF_CENTEC) \
              $(DOCKER_SYNCD_CENTEC_RPC)
 
 # Inject centec sai into sairedis
diff --git a/platform/mellanox/docker-ptf-mlnx.mk b/platform/mellanox/docker-ptf-mlnx.mk
new file mode 100644
index 00000000000..7f23dc715e3
--- /dev/null
+++ b/platform/mellanox/docker-ptf-mlnx.mk
@@ -0,0 +1,7 @@
+# docker image for docker-ptf-mlnx
+
+DOCKER_PTF_MLNX = docker-ptf-mlnx.gz
+$(DOCKER_PTF_MLNX)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
+$(DOCKER_PTF_MLNX)_DEPENDS += $(PYTHON_SAITHRIFT_MLNX)
+$(DOCKER_PTF_MLNX)_LOAD_DOCKERS += $(DOCKER_PTF)
+SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index a56d9b0d574..6b88748c73a 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -9,9 +9,11 @@ include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk
 include $(PLATFORM_PATH)/one-image.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/python-saithrift.mk
+include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM) \
+             $(DOCKER_PTF_MLNX) \
              $(DOCKER_SYNCD_MLNX_RPC)
 
 # Inject mlnx sai into sairedis