diff --git a/.gitmodules b/.gitmodules
index 715e14ebfdf..eb58189697b 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 6fcf467fdc4..37100258229 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 6fcf467fdc4f631ae4c9b2786653dc8e6d7d0d54
+Subproject commit 37100258229f6d2929d6d02c1a18192dc7567be4
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 158de8d3463..b21b74ed34b 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 158de8d3463ff4b841653f6d57190bb142b80d9c
+Subproject commit b21b74ed34b6ec83ce59279086778ab3eeb4549a