diff --git a/dockers/docker-syncd-rpc/Dockerfile b/dockers/docker-syncd-brcm-rpc/Dockerfile
similarity index 88%
rename from dockers/docker-syncd-rpc/Dockerfile
rename to dockers/docker-syncd-brcm-rpc/Dockerfile
index ed75d1a1f0ec..23f5e7a25f6a 100644
--- a/dockers/docker-syncd-rpc/Dockerfile
+++ b/dockers/docker-syncd-brcm-rpc/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker-syncd
+FROM docker-syncd-brcm
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -43,7 +43,7 @@ RUN apt-get update \
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
 
-ENTRYPOINT service rsyslog start \
-    && sysctl -w net.core.rmem_max=509430500 \
-    && service syncd start       \
-    && /usr/bin/supervisord
+RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["/usr/bin/start.sh"]
diff --git a/dockers/docker-syncd-rpc/ptf_nn_agent.conf b/dockers/docker-syncd-brcm-rpc/ptf_nn_agent.conf
similarity index 100%
rename from dockers/docker-syncd-rpc/ptf_nn_agent.conf
rename to dockers/docker-syncd-brcm-rpc/ptf_nn_agent.conf
diff --git a/dockers/docker-syncd-rpc/supervisord.conf b/dockers/docker-syncd-brcm-rpc/supervisord.conf
similarity index 100%
rename from dockers/docker-syncd-rpc/supervisord.conf
rename to dockers/docker-syncd-brcm-rpc/supervisord.conf
diff --git a/dockers/docker-syncd-mlnx-rpc/Dockerfile b/dockers/docker-syncd-mlnx-rpc/Dockerfile
index 3b891784b226..42e24be7ecb5 100644
--- a/dockers/docker-syncd-mlnx-rpc/Dockerfile
+++ b/dockers/docker-syncd-mlnx-rpc/Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update \
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf
 
-ENTRYPOINT service rsyslog start \
-    && sysctl -w net.core.rmem_max=509430500 \
-    && service syncd start       \
-    && /usr/bin/supervisord
+RUN sed -i 's/read/sysctl -w net.core.rmem_max=509430500 ; \/usr\/bin\/supervisord/' /usr/bin/start.sh
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["/usr/bin/start.sh"]