diff --git a/gso/workflows/edge_port/validate_edge_port.py b/gso/workflows/edge_port/validate_edge_port.py
index 33b882a6569a7e936c2f036c55e96850b2c0e222..4aec9471f007eaeb5f27d5d497b5871469c1889d 100644
--- a/gso/workflows/edge_port/validate_edge_port.py
+++ b/gso/workflows/edge_port/validate_edge_port.py
@@ -78,21 +78,22 @@ def verify_base_config(subscription: dict[str, Any]) -> LSOState:
     "Validate Edge Port Configuration", target=Target.SYSTEM, initial_input_form=wrap_modify_initial_input_form(None)
 )
 def validate_edge_port() -> StepList:
-    """Validate an existing, active Edge port subscription.
+    """Validate an existing, active Edge port subscription if it is on a Nokia device.
 
-    * Check correct configuration of interfaces in NetBox, only when the Edge Port is on a Nokia device.
+    * Check correct configuration of interfaces in NetBox.
     * Verify create Edge port configuration.
     """
-    edge_port_is_on_nokia = conditional(
-        lambda state: state["subscription"]["edge_port"]["node"]["vendor"] == Vendor.NOKIA
+    edge_port_is_on_juniper = conditional(
+        lambda state: state["subscription"]["edge_port"]["node"]["vendor"] == Vendor.JUNIPER
     )
 
     return (
         begin
         >> store_process_subscription(Target.SYSTEM)
-        >> unsync
         >> prepare_state
-        >> edge_port_is_on_nokia(verify_netbox_entries)
+        >> edge_port_is_on_juniper(done)
+        >> unsync
+        >> verify_netbox_entries
         >> anonymous_lso_interaction(verify_base_config)
         >> resync
         >> done