diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index b6c2d97d77cd..b7357ad58f67 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -41,6 +41,8 @@ supervisorctl start enable_counters
 
 supervisorctl start nbrmgrd
 
+supervisorctl start vxlanmgrd
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index e6bfba3cb283..4479a27f2a7b 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -127,3 +127,10 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
+[program:vxlanmgrd]
+command=/usr/bin/vxlanmgrd
+priority=16
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index 043753aa2926..e8d062411f1c 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -63,6 +63,8 @@ supervisorctl start buffermgrd
 
 supervisorctl start nbrmgrd
 
+supervisorctl start vxlanmgrd
+
 # Start arp_update when VLAN exists
 VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index c3d0ef4ab6fb..5b637e507053 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -164,3 +164,11 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:vxlanmgrd]
+command=/usr/bin/vxlanmgrd
+priority=21
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/src/sonic-swss b/src/sonic-swss
index e329dbdf66d9..d612d5e50972 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e329dbdf66d9bc4ca504e73ba589db8bc34cf997
+Subproject commit d612d5e50972e7f7574aaa5f24b5994e1194daaa