diff --git a/.gitmodules b/.gitmodules
index 96bb4ed2cda..c59da84abc1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/Azure/sonic-swss-common
+	url = https://github.com/vganesan-nokia/sonic-swss-common
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/Azure/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/Azure/sonic-sairedis
+	url = https://github.com/vganesan-nokia/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/Azure/sonic-swss
+	url = https://github.com/vganesan-nokia/sonic-swss
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
diff --git a/dockers/docker-database/database_config.json.j2 b/dockers/docker-database/database_config.json.j2
index 6d116b5e1ae..fb88331939d 100644
--- a/dockers/docker-database/database_config.json.j2
+++ b/dockers/docker-database/database_config.json.j2
@@ -5,6 +5,12 @@
             "port" : 6379,
             "unix_socket_path" : "/var/run/redis{{NAMESPACE_ID}}/redis.sock",
             "persistence_for_warm_boot" : "yes"
+        },
+        "redis-voq":{
+            "hostname" : "240.127.1.1",
+            "port" : 6380,
+            "unix_socket_path" : "/var/run/redis{{NAMESPACE_ID}}/redis-voq.sock",
+            "persistence_for_warm_boot" : "yes"
         }
     },
     "DATABASES" : {
@@ -52,6 +58,11 @@
             "id" : 7,
             "separator": "|",
             "instance" : "redis"
+        },
+        "VOQ_DB" : {
+            "id" : 11,
+            "separator": ":",
+            "instance" : "redis-voq"
         }
     },
     "VERSION" : "1.0"
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index c810e5ffbd2..d92208ed0d3 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit c810e5ffbd2ddb505fee0363bc3d1d30181dd1ac
+Subproject commit d92208ed0d3ab3e1731cfda9b1020b827131450d
diff --git a/src/sonic-swss b/src/sonic-swss
index d2bab10efe0..c02f4b5cab4 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit d2bab10efe05e8ec209fd5a360778a2d7c8d7f54
+Subproject commit c02f4b5cab497eb6df675281c1578fd6fdf424a0
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index ed9c497316e..aa7b72b3213 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit ed9c497316e73bc5d4a6dfbe9f3507d5e92c15f3
+Subproject commit aa7b72b32139e0f3114093d403b26d84cd303e85