diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index db11d662a3a..73a8c0d4221 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -88,8 +88,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
 {% endif %}
 !
-{# set bmp info #}
-{% if (FEATURE is defined) and ('bmp' in FEATURE) and ('state' in FEATURE['bmp']) and (FEATURE['bmp']['state'] == 'enabled') %}
 !
   bmp mirror buffer-limit 4294967214
 !
@@ -100,7 +98,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
 !
 !
-{% endif %}
 {# set router-id #}
 {% if DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or DEVICE_METADATA['localhost']['switch_type'] == 'voq' or DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
 {% if 'bgp_router_id' in DEVICE_METADATA['localhost'] %}
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
index 113289af3b7..365a3a7124d 100644
--- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
+++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -88,11 +88,7 @@ dependent_startup_wait_for=zebra:running
 {% endif %}
 
 [program:bgpd]
-{% if FEATURE is defined and FEATURE.bmp is defined and FEATURE.bmp.state is defined and FEATURE.bmp.state == "enabled" %}
 command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp -M bmp
-{% else %}
-command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
-{% endif %}
 priority=5
 stopsignal=KILL
 autostart=false
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index d2dc9e40e89..959877a5077 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -44,6 +44,15 @@ router bgp 55555
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf
index 27d04b953a3..eb1400db807 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf
@@ -15,6 +15,15 @@ router bgp 55555
   bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only.conf
index b181dbd5e43..d880b4f8c27 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only.conf
@@ -42,6 +42,15 @@ router bgp 55555
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
 !
   network 55.55.55.56/32 route-map HIDE_INTERNAL
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only_router_id.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only_router_id.conf
index c41fa0cfedc..8f075c7b707 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only_router_id.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only_router_id.conf
@@ -42,6 +42,15 @@ router bgp 55555
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
 !
   bgp router-id 8.8.8.8
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_ipv6_lo4096_router_id.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_ipv6_lo4096_router_id.conf
index 213872f45c7..815a8d23302 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_ipv6_lo4096_router_id.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_ipv6_lo4096_router_id.conf
@@ -40,6 +40,15 @@ router bgp 55555
 !
   bgp bestpath as-path multipath-relax
 !
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 8.8.8.8
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_router_id.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_router_id.conf
index 213872f45c7..815a8d23302 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_router_id.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_router_id.conf
@@ -40,6 +40,15 @@ router bgp 55555
 !
   bgp bestpath as-path multipath-relax
 !
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 8.8.8.8
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
index 11272757855..bc774f8bbe5 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -52,6 +52,16 @@ router bgp 65100
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
index 5db248ab852..9e4055b8002 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -52,6 +52,16 @@ router bgp 65100
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
index ab7f99d43cd..1b9f35d63a0 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -59,6 +59,16 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
index 2d769fc05dd..069ea6e12d2 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
@@ -53,6 +53,16 @@ router bgp 65100
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
index b84ff10f590..9fb87176bf6 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -59,6 +59,16 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
index 17d7f561db0..845bb175d59 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -72,6 +72,16 @@ router bgp 65100
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
   bgp graceful-restart select-defer-time 45
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
index 0b0446aad9e..8b326096c73 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -64,6 +64,16 @@ router bgp 4000
 !
   bgp bestpath as-path multipath-relax
 !
+!
+!
+    bmp mirror buffer-limit 4294967214
+!
+    bmp targets sonic-bmp
+    bmp stats interval 1000
+    bmp monitor ipv4 unicast pre-policy
+    bmp monitor ipv6 unicast pre-policy
+    bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
+!
 !
   bgp router-id 4.0.0.0
 !