diff --git a/neutron/services/trunk/plugin.py b/neutron/services/trunk/plugin.py
index b04cb2e05e8..9473d9687c5 100644
--- a/neutron/services/trunk/plugin.py
+++ b/neutron/services/trunk/plugin.py
@@ -223,7 +223,7 @@ class TrunkPlugin(service_base.ServicePluginBase,
                                         port_id=trunk['port_id'],
                                         status=constants.DOWN_STATUS,
                                         sub_ports=sub_ports)
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk_obj.create()
             payload = callbacks.TrunkPayload(context, trunk_obj.id,
                                              current_trunk=trunk_obj)
@@ -238,7 +238,7 @@ class TrunkPlugin(service_base.ServicePluginBase,
     def update_trunk(self, context, trunk_id, trunk):
         """Update information for the specified trunk."""
         trunk_data = trunk['trunk']
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk_obj = self._get_trunk(context, trunk_id)
             original_trunk = copy.deepcopy(trunk_obj)
             # NOTE(status_police): a trunk status should not change during an
@@ -258,7 +258,7 @@ class TrunkPlugin(service_base.ServicePluginBase,
 
     def delete_trunk(self, context, trunk_id):
         """Delete the specified trunk."""
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk = self._get_trunk(context, trunk_id)
             rules.trunk_can_be_managed(context, trunk)
             trunk_port_validator = rules.TrunkPortValidator(trunk.port_id)
@@ -280,7 +280,7 @@ class TrunkPlugin(service_base.ServicePluginBase,
     @db_base_plugin_common.convert_result_to_dict
     def add_subports(self, context, trunk_id, subports):
         """Add one or more subports to trunk."""
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk = self._get_trunk(context, trunk_id)
 
             # Check for basic validation since the request body here is not
@@ -334,7 +334,7 @@ class TrunkPlugin(service_base.ServicePluginBase,
     def remove_subports(self, context, trunk_id, subports):
         """Remove one or more subports from trunk."""
         subports = subports['sub_ports']
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk = self._get_trunk(context, trunk_id)
             original_trunk = copy.deepcopy(trunk)
             rules.trunk_can_be_managed(context, trunk)
diff --git a/neutron/services/trunk/rpc/server.py b/neutron/services/trunk/rpc/server.py
index 3c8c2953953..7441721fff8 100644
--- a/neutron/services/trunk/rpc/server.py
+++ b/neutron/services/trunk/rpc/server.py
@@ -104,7 +104,7 @@ class TrunkSkeleton(object):
 
     def update_trunk_status(self, context, trunk_id, status):
         """Update the trunk status to reflect outcome of data plane wiring."""
-        with db_api.autonested_transaction(context.session):
+        with db_api.context_manager.writer.using(context):
             trunk = trunk_objects.Trunk.get_object(context, id=trunk_id)
             if trunk:
                 trunk.update(status=status)