diff --git a/dockers/docker-ptf-saithrift/Dockerfile b/dockers/docker-ptf-saithrift/Dockerfile
new file mode 100644
index 00000000000..88176faffb5
--- /dev/null
+++ b/dockers/docker-ptf-saithrift/Dockerfile
@@ -0,0 +1,12 @@
+FROM docker-ptf
+
+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/brcm_interface_to_front_map.ini b/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini
new file mode 100644
index 00000000000..0db110025b8
--- /dev/null
+++ b/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini
@@ -0,0 +1,33 @@
+# ptf host interface @ switch front port name
+0@Ethernet0
+1@Ethernet4
+2@Ethernet8
+3@Ethernet12
+4@Ethernet16
+5@Ethernet20
+6@Ethernet24
+7@Ethernet28
+8@Ethernet32
+9@Ethernet36
+10@Ethernet40
+11@Ethernet44
+12@Ethernet48
+13@Ethernet52
+14@Ethernet56
+15@Ethernet60
+16@Ethernet64
+17@Ethernet68
+18@Ethernet72
+19@Ethernet76
+20@Ethernet80
+21@Ethernet84
+22@Ethernet88
+23@Ethernet92
+24@Ethernet96
+25@Ethernet100
+26@Ethernet104
+27@Ethernet108
+28@Ethernet112
+29@Ethernet116
+30@Ethernet120
+31@Ethernet124
diff --git a/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini b/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini
new file mode 100644
index 00000000000..4421812aeef
--- /dev/null
+++ b/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini
@@ -0,0 +1,33 @@
+# ptf host interface @ switch front port name
+0@Ethernet1
+1@Ethernet2
+2@Ethernet3
+3@Ethernet4
+4@Ethernet5
+5@Ethernet6
+6@Ethernet7
+7@Ethernet8
+8@Ethernet9
+9@Ethernet10
+10@Ethernet11
+11@Ethernet12
+12@Ethernet13
+13@Ethernet14
+14@Ethernet15
+15@Ethernet16
+16@Ethernet17
+17@Ethernet18
+18@Ethernet19
+19@Ethernet20
+20@Ethernet21
+21@Ethernet22
+22@Ethernet23
+23@Ethernet24
+24@Ethernet25
+25@Ethernet26
+26@Ethernet27
+27@Ethernet28
+28@Ethernet29
+29@Ethernet30
+30@Ethernet31
+31@Ethernet32
diff --git a/dockers/docker-syncd-mlnx-rpc/Dockerfile b/dockers/docker-syncd-mlnx-rpc/Dockerfile
index ca68b8a2930..734171ffb3e 100644
--- a/dockers/docker-syncd-mlnx-rpc/Dockerfile
+++ b/dockers/docker-syncd-mlnx-rpc/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
+    supervisor          \
  && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
@@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
 
 ENTRYPOINT service rsyslog start \
     && service syncd start       \
-    && while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \
     && /usr/bin/supervisord
diff --git a/dockers/docker-syncd-rpc/Dockerfile b/dockers/docker-syncd-rpc/Dockerfile
index e7f6912746f..28108a82582 100644
--- a/dockers/docker-syncd-rpc/Dockerfile
+++ b/dockers/docker-syncd-rpc/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update \
     python-dev          \
     wget                \
     cmake               \
+    supervisor          \
  && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
  && tar xvfz 1.0.0.tar.gz \
  && cd nanomsg-1.0.0    \
@@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
 
 ENTRYPOINT service rsyslog start \
     && service syncd start       \
-    && while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \
     && /usr/bin/supervisord