diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 60f97c33ccb5..21f4a495bd1e 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 60f97c33ccb5b218c68b8c3fe94a48719ed09435
+Subproject commit 21f4a495bd1ef5249af3546a320072d14b1fe2a6
diff --git a/src/sonic-swss b/src/sonic-swss
index 85f63223a252..bf21ee33f582 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 85f63223a252f011c0240dc405bf25c8259dd136
+Subproject commit bf21ee33f582c2f3675ab3472961b7efcd4cb61b