diff --git a/python/neutron-understack/neutron_understack/routers.py b/python/neutron-understack/neutron_understack/routers.py
index e883cb476..e36fde33c 100644
--- a/python/neutron-understack/neutron_understack/routers.py
+++ b/python/neutron-understack/neutron_understack/routers.py
@@ -58,7 +58,7 @@ def create_port_postcommit(context: PortContext) -> None:
 
     # Trunk
     shared_port = utils.create_neutron_port_for_segment(segment, context)
-    add_subport_to_trunk(shared_port, segment, context)
+    add_subport_to_trunk(shared_port, segment)
 
     # OVN
     segment_obj = utils.network_segment_by_id(segment["id"])
@@ -84,9 +84,7 @@ def is_only_router_port_on_network(
         return True
 
 
-def add_subport_to_trunk(
-    shared_port: PortDict, segment: NetworkSegmentDict, context: PortContext
-) -> None:
+def add_subport_to_trunk(shared_port: PortDict, segment: NetworkSegmentDict) -> None:
     """Adds requested port as a subport of a trunk connection for network nodes.
 
     The trunk and parent port must already exist.
@@ -101,7 +99,7 @@ def add_subport_to_trunk(
         ]
     }
     utils.fetch_trunk_plugin().add_subports(
-        context=context.plugin_context,
+        context=n_context.get_admin_context(),
         trunk_id=cfg.CONF.ml2_understack.network_node_trunk_uuid,
         subports=subports,
     )
diff --git a/python/neutron-understack/neutron_understack/tests/test_routers.py b/python/neutron-understack/neutron_understack/tests/test_routers.py
index ed2625f1b..a68d29d5e 100644
--- a/python/neutron-understack/neutron_understack/tests/test_routers.py
+++ b/python/neutron-understack/neutron_understack/tests/test_routers.py
@@ -32,7 +32,7 @@ def test_when_successful(self, mocker, port_context, network_id):
 
 
 class TestAddSubportToTrunk:
-    def test_when_successful(self, mocker, port_context):
+    def test_when_successful(self, mocker):
         trunk_id = "trunk-uuid"
         port = {"id": "port-123"}
         segment = {"segmentation_id": 42}
@@ -40,6 +40,9 @@ def test_when_successful(self, mocker, port_context):
             "oslo_config.cfg.CONF.ml2_understack.network_node_trunk_uuid",
             trunk_id,
         )
+        mocker.patch(
+            "neutron_lib.context.get_admin_context", return_value="admin_context"
+        )
 
         mock_trunk_plugin = mocker.Mock()
         mocker.patch(
@@ -47,10 +50,10 @@ def test_when_successful(self, mocker, port_context):
             return_value=mock_trunk_plugin,
         )
 
-        add_subport_to_trunk(port, segment, port_context)
+        add_subport_to_trunk(port, segment)
 
         mock_trunk_plugin.add_subports.assert_called_once_with(
-            context=port_context.plugin_context,
+            context="admin_context",
             trunk_id=trunk_id,
             subports={
                 "sub_ports": [
@@ -190,7 +193,7 @@ def test_no_router_on_network(self, mocker, port_context):
 
         create_segment.assert_called_once_with(port_context)
         create_neutron_port.assert_called_once_with(fake_segment, port_context)
-        add_trunk.assert_called_once_with(port, fake_segment, port_context)
+        add_trunk.assert_called_once_with(port, fake_segment)
         fetch_segment_obj.assert_called_once_with(fake_segment["id"])
         create_uplink_port.assert_called_once_with(
             fake_segment, port_context.current["network_id"]