diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
index 2170ca699283..96149de4c379 100755
--- a/dockers/docker-fpm-frr/docker_init.sh
+++ b/dockers/docker-fpm-frr/docker_init.sh
@@ -15,8 +15,8 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/gen_frr.conf.j2,/etc/frr/frr.conf \
     -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
     -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
-    -t /usr/local/sonic/frr/bfdd.conf.j2,/etc/frr/bfdd.conf \
-    -t /usr/local/sonic/frr/ospfd.conf.j2,/etc/frr/ospfd.conf \
+    -t /usr/local/sonic/frrcfgd/bfdd.conf.j2,/etc/frr/bfdd.conf \
+    -t /usr/local/sonic/frrcfgd/ospfd.conf.j2,/etc/frr/ospfd.conf \
 "
 
 FRR_VARS=$(sonic-cfggen $CFGGEN_PARAMS)
diff --git a/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
index 2b5af9513f37..bb6d7f6a5a65 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2
@@ -1,5 +1,5 @@
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
-    {% include "/usr/local/sonic/frr/bgpd.conf.j2" %}
+    {% include "/usr/local/sonic/frrcfgd/bgpd.conf.j2" %}
 {% else %}
     {% include "/usr/share/sonic/templates/bgpd/bgpd.conf.j2" %}
 {% endif %}
diff --git a/dockers/docker-fpm-frr/frr/gen_frr.conf.j2 b/dockers/docker-fpm-frr/frr/gen_frr.conf.j2
index 055658f8b515..181437da07a0 100644
--- a/dockers/docker-fpm-frr/frr/gen_frr.conf.j2
+++ b/dockers/docker-fpm-frr/frr/gen_frr.conf.j2
@@ -1,5 +1,5 @@
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
-    {% include "/usr/local/sonic/frr/frr.conf.j2" %}
+    {% include "/usr/local/sonic/frrcfgd/frr.conf.j2" %}
 {% else %}
     {% include "/usr/share/sonic/templates/frr.conf.j2" %}
 {% endif %}
diff --git a/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2 b/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
index f1d0c5f46290..1346c9a4993b 100644
--- a/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
+++ b/dockers/docker-fpm-frr/frr/staticd/gen_staticd.conf.j2
@@ -1,5 +1,5 @@
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
-    {% include "/usr/local/sonic/frr/staticd.conf.j2" %}
+    {% include "/usr/local/sonic/frrcfgd/staticd.conf.j2" %}
 {% else %}
     {% include "/usr/share/sonic/templates/staticd/staticd.conf.j2" %}
 {% endif %}
diff --git a/src/sonic-frr-mgmt-framework/setup.py b/src/sonic-frr-mgmt-framework/setup.py
index c9bff63d8c73..d8681d1bbd88 100755
--- a/src/sonic-frr-mgmt-framework/setup.py
+++ b/src/sonic-frr-mgmt-framework/setup.py
@@ -26,26 +26,26 @@
         'pytest-cov',
         'sonic-config-engine'
     ],
-    data_files = [('sonic/frr', ['templates/bgpd/bgpd.conf.j2',
-                                 'templates/bgpd/bgpd.conf.db.j2',
-                                 'templates/bgpd/bgpd.conf.db.route_map.j2',
-                                 'templates/bgpd/bgpd.conf.db.pref_list.j2',
-                                 'templates/bgpd/bgpd.conf.db.nbr_or_peer.j2',
-                                 'templates/bgpd/bgpd.conf.db.nbr_af.j2',
-                                 'templates/bgpd/bgpd.conf.db.comm_list.j2',
-                                 'templates/bgpd/bgpd.conf.db.addr_family.j2',
-                                 'templates/bgpd/bgpd.conf.db.addr_family.evpn.j2',
-                                 'templates/bfdd/bfdd.conf.j2',
-                                 'templates/ospfd/ospfd.conf.j2',
-                                 'templates/ospfd/ospfd.conf.db.area.j2',
-                                 'templates/ospfd/ospfd.conf.db.comm_list.j2',
-                                 'templates/ospfd/ospfd.conf.db.distributeroute.j2',
-                                 'templates/ospfd/ospfd.conf.db.interface.j2',
-                                 'templates/ospfd/ospfd.conf.db.policyrange.j2',
-                                 'templates/ospfd/ospfd.conf.db.vlink.j2',
-                                 'templates/staticd/staticd.conf.j2',
-                                 'templates/staticd/staticd.db.conf.j2',
-                                 'templates/staticd/staticd.db.default_route.conf.j2',
-                                 'templates/frr/frr.conf.j2'])
+    data_files = [('sonic/frrcfgd', ['templates/bgpd/bgpd.conf.j2',
+                                     'templates/bgpd/bgpd.conf.db.j2',
+                                     'templates/bgpd/bgpd.conf.db.route_map.j2',
+                                     'templates/bgpd/bgpd.conf.db.pref_list.j2',
+                                     'templates/bgpd/bgpd.conf.db.nbr_or_peer.j2',
+                                     'templates/bgpd/bgpd.conf.db.nbr_af.j2',
+                                     'templates/bgpd/bgpd.conf.db.comm_list.j2',
+                                     'templates/bgpd/bgpd.conf.db.addr_family.j2',
+                                     'templates/bgpd/bgpd.conf.db.addr_family.evpn.j2',
+                                     'templates/bfdd/bfdd.conf.j2',
+                                     'templates/ospfd/ospfd.conf.j2',
+                                     'templates/ospfd/ospfd.conf.db.area.j2',
+                                     'templates/ospfd/ospfd.conf.db.comm_list.j2',
+                                     'templates/ospfd/ospfd.conf.db.distributeroute.j2',
+                                     'templates/ospfd/ospfd.conf.db.interface.j2',
+                                     'templates/ospfd/ospfd.conf.db.policyrange.j2',
+                                     'templates/ospfd/ospfd.conf.db.vlink.j2',
+                                     'templates/staticd/staticd.conf.j2',
+                                     'templates/staticd/staticd.db.conf.j2',
+                                     'templates/staticd/staticd.db.default_route.conf.j2',
+                                     'templates/frr/frr.conf.j2'])
     ]
 )