diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index 0f74745987..b6c2d97d77 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -27,6 +27,8 @@ supervisorctl start neighsyncd
 
 supervisorctl start swssconfig
 
+supervisorctl start vrfmgrd
+
 supervisorctl start vlanmgrd
 
 supervisorctl start intfmgrd
@@ -37,8 +39,6 @@ supervisorctl start buffermgrd
 
 supervisorctl start enable_counters
 
-supervisorctl start vrfmgrd
-
 supervisorctl start nbrmgrd
 
 # Start arp_update when VLAN exists
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 70b81383fa..cb0bf202b9 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -93,7 +93,7 @@ start() {
         /usr/bin/docker exec database redis-cli -n 0 FLUSHDB
         /usr/bin/docker exec database redis-cli -n 2 FLUSHDB
         /usr/bin/docker exec database redis-cli -n 5 FLUSHDB
-        clean_up_tables 6 "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*'"
+        clean_up_tables 6 "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*'"
     fi
 
     # start service docker
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index f1fca86e00..1b34be2cd7 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -48,6 +48,8 @@ supervisorctl start fpmsyncd
 
 supervisorctl start teammgrd
 
+supervisorctl start vrfmgrd
+
 supervisorctl start portmgrd
 
 supervisorctl start intfmgrd
@@ -58,8 +60,6 @@ supervisorctl start zebra
 
 supervisorctl start buffermgrd
 
-supervisorctl start vrfmgrd
-
 supervisorctl start nbrmgrd
 
 # Start arp_update when VLAN exists