diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 73b7747f7f9d14ca81e8f20198cbe81fd0ebb006..73be339358b0fab7aac15801840a85464c9aa521 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -46,16 +46,16 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
             title = product_name
 
         geant_s_sid: str
-        iptrunk_sideA_fqdn: device_selector(choice_value='DeviceEnumA')
-        iptrunk_sideB_fqdn: device_selector(choice_value='DeviceEnumB')
         iptrunk_speed: str  # This should be an enum: 1/10/100/400
         iptrunk_minimum_links: int
-        iptrunk_sideA_fqdn: a_side_device_selector()
+
+        iptrunk_sideA_fqdn: device_selector(choice_value='DeviceEnumA')
         iptrunk_sideA_ae_iface: str
         iptrunk_sideA_ae_members: list[str]
-        iptrunk_sideB_fqdn: b_side_device_selector()
+
+        iptrunk_sideB_fqdn: device_selector(choice_value='DeviceEnumB')
         iptrunk_sideB_ae_iface: str
-        iptrunk_sideA_ae_members: list[str]
+        iptrunk_sideB_ae_members: list[str]
         # TODO: we need additional validation: 
         # sideA fqdn must be different from sideB fqdn
         # the lenght of iptrunk_sideA_ae_members should be the same as iptrunk_sideA_ae_members