diff --git a/neutron_dynamic_routing/services/bgp/agent/entry.py b/neutron_dynamic_routing/services/bgp/agent/entry.py
index a59c1cb4..b4b3bd99 100644
--- a/neutron_dynamic_routing/services/bgp/agent/entry.py
+++ b/neutron_dynamic_routing/services/bgp/agent/entry.py
@@ -18,9 +18,9 @@ import sys
 from oslo_config import cfg
 from oslo_service import service
 
-from neutron.agent.common import config
 from neutron.agent.linux import external_process
 from neutron.common import config as common_config
+from neutron.conf.agent import common as config
 from neutron import service as neutron_service
 
 from neutron_dynamic_routing.services.bgp.agent import config as bgp_dragent_config  # noqa
diff --git a/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py b/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
index a68c4982..f10965c9 100644
--- a/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
+++ b/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
@@ -23,8 +23,8 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 import testtools
 
-from neutron.agent.common import config
 from neutron.common import config as n_config
+from neutron.conf.agent import common as config
 from neutron.tests import base
 
 from neutron_dynamic_routing.services.bgp.agent import bgp_dragent