diff --git a/neutron_taas/services/taas/agents/ovs/taas_ovs_agent.py b/neutron_taas/services/taas/agents/ovs/taas_ovs_agent.py
index b87cc2a..41a05ee 100644
--- a/neutron_taas/services/taas/agents/ovs/taas_ovs_agent.py
+++ b/neutron_taas/services/taas/agents/ovs/taas_ovs_agent.py
@@ -14,12 +14,12 @@
 # under the License.
 
 
-from neutron.common import rpc as n_rpc
 from neutron import manager
 
 from neutron_taas.common import topics
 from neutron_taas.services.taas.agents import taas_agent_api as api
 
+from neutron_lib import rpc as n_rpc
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_service import service
diff --git a/neutron_taas/services/taas/agents/taas_agent_api.py b/neutron_taas/services/taas/agents/taas_agent_api.py
index 2dde63d..2ee54e9 100644
--- a/neutron_taas/services/taas/agents/taas_agent_api.py
+++ b/neutron_taas/services/taas/agents/taas_agent_api.py
@@ -13,11 +13,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from neutron_lib import rpc as n_rpc
 from neutron_taas._i18n import _
 from oslo_config import cfg
 import oslo_messaging as messaging
 
-from neutron.common import rpc as n_rpc
 
 TaasOpts = [
     cfg.StrOpt(
diff --git a/neutron_taas/services/taas/service_drivers/taas_agent_api.py b/neutron_taas/services/taas/service_drivers/taas_agent_api.py
index 4e8ac8b..4d3fa8e 100644
--- a/neutron_taas/services/taas/service_drivers/taas_agent_api.py
+++ b/neutron_taas/services/taas/service_drivers/taas_agent_api.py
@@ -14,8 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from neutron.common import rpc as n_rpc
-
+from neutron_lib import rpc as n_rpc
 from oslo_log import log as logging
 import oslo_messaging as messaging
 
diff --git a/neutron_taas/services/taas/service_drivers/taas_rpc.py b/neutron_taas/services/taas/service_drivers/taas_rpc.py
index 72c3e18..b8efee1 100644
--- a/neutron_taas/services/taas/service_drivers/taas_rpc.py
+++ b/neutron_taas/services/taas/service_drivers/taas_rpc.py
@@ -14,8 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from neutron.common import rpc as n_rpc
 from neutron_lib import exceptions as n_exc
+from neutron_lib import rpc as n_rpc
 from neutron_taas.common import topics
 from neutron_taas.services.taas import service_drivers
 from neutron_taas.services.taas.service_drivers import taas_agent_api