diff --git a/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2 b/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
index 82b973d37cc9..88ad9b46dac2 100644
--- a/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
+++ b/dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
@@ -4,6 +4,7 @@
 {%   for vnet_name, vnet_metadata in VNET.items() %}
 vrf {{ vnet_name }}
 vni {{ vnet_metadata['vni'] }}
+exit
 !
 {%   endfor %}
 {%  endif %}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
index 6b7e1feff000..bd8afe7f915c 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
@@ -22,9 +22,11 @@ log facility local4
 !
 vrf First
 vni 10
+exit
 !
 vrf Second
 vni 20
+exit
 !
 ! Enable nht through default route
 ip nht resolve-via-default
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
index 8bb483456829..4cdb8bceaba6 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
@@ -22,6 +22,7 @@ log facility local4
 !
 vrf VnetFE
 vni 9000
+exit
 !
 !
 ! Enable nht through default route
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
index 402230348a4a..ca56e9ca0fdd 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
@@ -22,6 +22,7 @@ log facility local4
 !
 vrf VnetFE
 vni 8000
+exit
 !
 !
 ! Enable nht through default route
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
index b55906056616..67f4f030de0b 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
@@ -22,6 +22,7 @@ log facility local4
 !
 vrf VnetFE
 vni 9000
+exit
 !
 !
 ! Enable nht through default route
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
index 19e303639a55..3b7b1f727a2a 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
@@ -22,6 +22,7 @@ log facility local4
 !
 vrf VnetFE
 vni 8000
+exit
 !
 !
 ! Enable nht through default route
diff --git a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
index be261bab99a8..f4d987989c38 100644
--- a/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
+++ b/src/sonic-config-engine/tests/sample_output/t2-chassis-fe-pc-zebra.conf
@@ -10,6 +10,7 @@ enable password zebra
 !
 vrf VnetFE
 vni 8000
+exit
 !
 !
 ! Enable nht through default route