diff --git a/.gitmodules b/.gitmodules
index 8e09ee538f4..85212600787 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/sonic-net/sonic-swss-common
+	url = https://github.com/yutongzhang-microsoft/sonic-swss-common
+	branch = feature/component-stats
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/sonic-net/sonic-linux-kernel
@@ -9,7 +10,8 @@
 	url = https://github.com/sonic-net/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/sonic-net/sonic-swss
+	url = https://github.com/yutongzhang-microsoft/sonic-swss
+	branch = swss-stats-use-componentstats
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
diff --git a/src/sonic-swss b/src/sonic-swss
index dcd97c98264..dd8ef329e83 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit dcd97c98264a1c5d8b15cc6937e9928757c61d6c
+Subproject commit dd8ef329e83e74d28d14a28ec05c81608f468425
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 56a5f2886f3..45758043c90 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 56a5f2886f34a666094c408a017220815ecc9c86
+Subproject commit 45758043c904381d205954dff935d52591ea57f7