diff --git a/.gitmodules b/.gitmodules
index d9188126bf..9e92d29e50 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,10 +15,10 @@
 	url = https://github.com/Azure/sonic-swss
 [submodule "src/p4-switch/switch"]
 	path = platform/p4/p4-switch/switch
-	url = https://github.com/lguohan/switch
+	url = https://github.com/krambn/switch
 [submodule "src/p4-bmv2/behavioral-model"]
 	path = platform/p4/p4-bmv/behavioral-model
-	url = https://github.com/lguohan/behavioral-model
+	url = https://github.com/krambn/behavioral-model
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
diff --git a/platform/p4/p4-bmv/behavioral-model b/platform/p4/p4-bmv/behavioral-model
index 0eb0d51736..ee3615eb15 160000
--- a/platform/p4/p4-bmv/behavioral-model
+++ b/platform/p4/p4-bmv/behavioral-model
@@ -1 +1 @@
-Subproject commit 0eb0d51736eeadd75384edfa8589e43a9ba734f4
+Subproject commit ee3615eb155f61c8d165281fd4f36b9ea78ba71a
diff --git a/platform/p4/p4-switch/switch b/platform/p4/p4-switch/switch
index 21adcdddac..584571b17d 160000
--- a/platform/p4/p4-switch/switch
+++ b/platform/p4/p4-switch/switch
@@ -1 +1 @@
-Subproject commit 21adcdddac59b75e4627255a12f1ed1a4369bb62
+Subproject commit 584571b17ddafcaa45a3d46eacc403b7e18cac1b