diff --git a/dockers/docker-fpm-frr/base_image_files/vtysh b/dockers/docker-fpm-frr/base_image_files/vtysh
index 359101c06c..18529b7522 100755
--- a/dockers/docker-fpm-frr/base_image_files/vtysh
+++ b/dockers/docker-fpm-frr/base_image_files/vtysh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker exec -i bgp vtysh "$@"
+docker exec -it bgp vtysh "$@"
diff --git a/dockers/docker-fpm-quagga/base_image_files/vtysh b/dockers/docker-fpm-quagga/base_image_files/vtysh
index 359101c06c..18529b7522 100755
--- a/dockers/docker-fpm-quagga/base_image_files/vtysh
+++ b/dockers/docker-fpm-quagga/base_image_files/vtysh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker exec -i bgp vtysh "$@"
+docker exec -it bgp vtysh "$@"
diff --git a/src/sonic-quagga b/src/sonic-quagga
index b066bef0e8..59f7c8ed56 160000
--- a/src/sonic-quagga
+++ b/src/sonic-quagga
@@ -1 +1 @@
-Subproject commit b066bef0e8dcf23b8e1751652397c09e61ee4bdd
+Subproject commit 59f7c8ed56fa1c9df2070596b25f5f019bdba8ca