diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 46b37e77c0e..9ae2776f6d2 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -34,7 +34,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:portsyncd]
-command=/usr/bin/portsyncd -p /usr/share/sonic/hwsku/port_config.ini
+command=/usr/bin/portsyncd
 priority=4
 autostart=false
 autorestart=false
diff --git a/platform/p4/docker-sonic-p4/supervisord.conf b/platform/p4/docker-sonic-p4/supervisord.conf
index 008f4c82d2c..946e4cb36e3 100644
--- a/platform/p4/docker-sonic-p4/supervisord.conf
+++ b/platform/p4/docker-sonic-p4/supervisord.conf
@@ -61,7 +61,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:portsyncd]
-command=/usr/bin/portsyncd -p /port_config.ini
+command=/usr/bin/portsyncd
 priority=6
 autostart=false
 autorestart=false
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index 2010dc918e0..65812d81fc9 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -44,7 +44,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:portsyncd]
-command=/usr/bin/portsyncd -p /usr/share/sonic/hwsku/port_config.ini
+command=/usr/bin/portsyncd
 priority=6
 autostart=false
 autorestart=false
diff --git a/src/sonic-swss b/src/sonic-swss
index 731a8f57119..2a1ffe8135c 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 731a8f57119d79e6d7ba6196f026a9e24664e074
+Subproject commit 2a1ffe8135c618d40dce9e4462a0a5ff604751d8