diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 8bb09a22be48fa479d55873f70b470a72ac62a3e..0c0ee530fdf8933325f0a0dab3b2479f37065bf6 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -106,12 +106,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
         @validator("side_a_ae_members", allow_reuse=True)
         def validate_interface_name_members(cls, side_a_ae_members: list[LAGMember]) -> list[LAGMember]:
-            if get_router_vendor(router_a) == RouterVendor.NOKIA:
-                ret_val = side_a_ae_members
-            else:
-                ret_val = validate_interface_name_list(side_a_ae_members)
-
-            return ret_val
+            vendor = get_router_vendor(router_a)
+            return validate_interface_name_list(side_a_ae_members, vendor)
 
     user_input_side_a = yield CreateIptrunkSideAForm
     # Remove the selected router for side A, to prevent any loops
@@ -162,13 +158,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
         @validator("side_b_ae_members", allow_reuse=True)
         def validate_interface_name_members(cls, side_b_ae_members: list[LAGMember]) -> list[LAGMember]:
-            ret_val = None
-            if get_router_vendor(router_b) == RouterVendor.NOKIA:
-                ret_val = side_b_ae_members
-            else:
-                ret_val = validate_interface_name_list(side_b_ae_members)
-
-            return ret_val
+            vendor = get_router_vendor(router_b)
+            return validate_interface_name_list(side_b_ae_members, vendor)
 
     user_input_side_b = yield CreateIptrunkSideBForm