diff --git a/vmware_nsx/dhcp_meta/combined.py b/vmware_nsx/dhcp_meta/combined.py
index b846bf84b3..904134af52 100644
--- a/vmware_nsx/dhcp_meta/combined.py
+++ b/vmware_nsx/dhcp_meta/combined.py
@@ -16,7 +16,7 @@
 #
 
 from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
-from neutron.common import topics
+from neutron_lib.agent import topics
 from neutron_lib import constants as const
 
 from vmware_nsx.dhcp_meta import nsx as nsx_svc
diff --git a/vmware_nsx/dhcp_meta/modes.py b/vmware_nsx/dhcp_meta/modes.py
index c00f37b087..698a7cf05d 100644
--- a/vmware_nsx/dhcp_meta/modes.py
+++ b/vmware_nsx/dhcp_meta/modes.py
@@ -15,6 +15,7 @@
 #    under the License.
 #
 
+from neutron_lib.agent import topics
 from neutron_lib import constants as const
 from oslo_concurrency import lockutils
 from oslo_config import cfg
@@ -25,7 +26,6 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
 from neutron.api.rpc.handlers import dhcp_rpc
 from neutron.api.rpc.handlers import metadata_rpc
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import agents_db
 
 from vmware_nsx._i18n import _
diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py
index 0be7f31b74..c48e07ef32 100644
--- a/vmware_nsx/plugins/nsx_v/plugin.py
+++ b/vmware_nsx/plugins/nsx_v/plugin.py
@@ -18,6 +18,7 @@ import uuid
 
 import netaddr
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef
 from neutron_lib.api.definitions import availability_zone as az_def
 from neutron_lib.api.definitions import external_net as extnet_apidef
@@ -60,7 +61,6 @@ from sqlalchemy.orm import exc as sa_exc
 from neutron.api import extensions as neutron_extensions
 from neutron.common import ipv6_utils
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.common import utils as n_utils
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import _utils as db_utils
diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py
index 71e367047c..b028cf3d3e 100644
--- a/vmware_nsx/plugins/nsx_v3/plugin.py
+++ b/vmware_nsx/plugins/nsx_v3/plugin.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import netaddr
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef
 from neutron_lib.api.definitions import availability_zone as az_def
 from neutron_lib.api.definitions import external_net as extnet_apidef
@@ -33,7 +34,6 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
 from neutron.api.rpc.handlers import dhcp_rpc
 from neutron.api.rpc.handlers import metadata_rpc
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import _utils as db_utils
 from neutron.db import agents_db