diff --git a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Tools.py b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Tools.py
index 20665fcb5d2141b7efc3aca458b46fdbece599f4..12b2069cf8cf2feb6d5a3981ab68ca4fd164ec36 100644
--- a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Tools.py
+++ b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Tools.py
@@ -160,7 +160,7 @@ def compose_optical_service(vlink_request : Dict) -> Dict:
         ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY,
         context_id=json_context_id(DEFAULT_CONTEXT_NAME),
         endpoint_ids=[
-            optical_border_endpoint_ids[1], optical_border_endpoint_ids[2]
+            optical_border_endpoint_ids[0], optical_border_endpoint_ids[-1]
         ],
         constraints=constraints,
     )