diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
index 390a403aa598..a504d6975683 100755
--- a/dockers/docker-fpm-frr/docker_init.sh
+++ b/dockers/docker-fpm-frr/docker_init.sh
@@ -45,11 +45,6 @@ write_default_zebra_config()
 {
     FILE_NAME=${1}
 
-    grep -q '^no fpm use-next-hop-groups' $FILE_NAME || {
-        echo "no fpm use-next-hop-groups" >> $FILE_NAME
-        echo "fpm address 127.0.0.1" >> $FILE_NAME
-    }
-
     grep -q '^no zebra nexthop kernel enable' $FILE_NAME || {
         echo "no zebra nexthop kernel enable" >> $FILE_NAME
     }
diff --git a/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2 b/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
index 4543ad8f974e..11ca8c609e64 100644
--- a/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
+++ b/dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
@@ -9,10 +9,6 @@
 {% block fpm %}
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 {% endblock fpm %}
 !
 {% include "common/daemons.common.conf.j2" %}
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 38db2964823e..c1450887d52f 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
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 120878fe1186..50e1b5eb0356 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
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
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 a6e3ad05310f..f110b17bd7e9 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
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
index 9e438caa0e34..c81611465e59 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf
index 0f49b229b88d..e37edf7c1b94 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf
+++ b/src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
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 c6c973f7f05c..6bdde0c12b88 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
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
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 84e76ecdb01c..7fe82c5794ea 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
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
index b8adb98787a7..32cf2fb2f1fd 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf
index 2741ba54cf4f..9018444fe48c 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf
+++ b/src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf
@@ -6,10 +6,6 @@
 !
 ! Force disable next hop group support
 no zebra nexthop kernel enable
-! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
-no fpm use-next-hop-groups
-!
-fpm address 127.0.0.1
 !
 ! template: common/daemons.common.conf.j2
 !