diff --git a/.gitmodules b/.gitmodules
index 7a75dfb0711..72fa5e14726 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,12 @@
 	url = https://github.com/sonic-net/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/sonic-net/sonic-sairedis
+	url = https://github.com/lolyu/sonic-sairedis
+	branch = vpp_acl_in_port_match
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/sonic-net/sonic-swss
+	url = https://github.com/lolyu/sonic-swss
+	branch = test_vpp_acl_in_ports_swss
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -128,7 +130,8 @@
 	url = https://github.com/Marvell-switching/sonic-platform-marvell.git
 [submodule "platform/vpp"]
 	path = platform/vpp
-	url = https://github.com/sonic-net/sonic-platform-vpp.git
+	url = https://github.com/lolyu/sonic-platform-vpp.git
+	branch = acl_policy_drop_not_if_drop
 [submodule "platform/marvell-prestera/mrvl-prestera"]
 	path = platform/marvell-prestera/mrvl-prestera
 	url = https://github.com/Marvell-switching/mrvl-prestera.git
diff --git a/platform/vpp b/platform/vpp
index a38dedf1eb7..a35d58072d5 160000
--- a/platform/vpp
+++ b/platform/vpp
@@ -1 +1 @@
-Subproject commit a38dedf1eb7b855a9dbd7ff75df8112e37af9757
+Subproject commit a35d58072d536167b353ab84fad95e0d26771937
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 1205916dd58..b51bb24f0fe 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 1205916dd5868f8fb6cc955017512951683c939f
+Subproject commit b51bb24f0fe67917a56e52baf111745f43ba42f8
diff --git a/src/sonic-swss b/src/sonic-swss
index ffb60db7299..8855e07074b 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit ffb60db7299a209ba927539d1a541f5e460dbf58
+Subproject commit 8855e07074b86fb05ff8ed2a94041be98aa0a6a4