diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml
index e393218ba6d736a1480047cf813f32921e1f6a06..538be40b68a52990d906439e3ae37cbb4272fa49 100644
--- a/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml
@@ -26,7 +26,7 @@
 - name: Set back ansible_host to target terminal server
   ansible.builtin.set_fact:
     ansible_host: "{{ wfo_router.router.router_site.site_ts_address }}"
-    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_connection: "{{ netconf_access[vendor].ansible_connection }}"
   when:
     wfo_router.router.router_access_via_ts is defined and
     ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true
diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/modify_router_list.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/modify_router_list.yaml
index bd6e905ae21f7d3d0081245f33c3dfc3e511b0b1..6edfd87838ef2446df0e687ea28a7b851fb55686 100644
--- a/geant/gap_ansible/roles/ibgp_update/tasks/modify_router_list.yaml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/modify_router_list.yaml
@@ -4,8 +4,8 @@
 
 - name: Adjust network connection according to the vendor
   ansible.builtin.set_fact:
-    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
-    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
+    ansible_connection: "{{ netconf_access[vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[vendor].ansible_network_os }}"
 
 - name: Include compile tasks
   ansible.builtin.include_tasks: compile.yaml