diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/check_nokia_ibgp.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/check_nokia_ibgp.yaml
index 8866ec46c43f21767856867f8dbcfff46b93d626..7c46a70acdca7e596a51b9abad3bb0787f8f07c1 100644
--- a/geant/gap_ansible/roles/ibgp_update/tasks/check_nokia_ibgp.yaml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/check_nokia_ibgp.yaml
@@ -1,7 +1,7 @@
 - name: Set variable to connect to nokia
   ansible.legacy.set_fact:
-    ansible_network_os: nokia.sros.md
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
 
 - name: Check BGP status
   block:
diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml
index aa5f1e13f1240109663676a36a78ad12f3cb68d1..e393218ba6d736a1480047cf813f32921e1f6a06 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
+    ansible_connection: "{{ netconf_access[wfo_router.router.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 5647d7237d3957c786543f6089c918ef0a4ce251..bd6e905ae21f7d3d0081245f33c3dfc3e511b0b1 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
@@ -3,18 +3,9 @@
 # PEs can be either Juniper or Nokia
 
 - name: Adjust network connection according to the vendor
-  block:
-    - name: Set variable to connect to nokia
-      ansible.legacy.set_fact:
-        ansible_network_os: geant.gap_ansible.sros
-        ansible_connection: netconf
-      when: vendor == "nokia"
-
-    - name: Set variables for connecting to Junos
-      ansible.legacy.set_fact:
-        ansible_network_os: junos
-        ansible_connection: netconf
-      when: vendor == "juniper"
+  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 }}"
 
 - name: Include compile tasks
   ansible.builtin.include_tasks: compile.yaml
diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/modify_subscription_router.yaml b/geant/gap_ansible/roles/ibgp_update/tasks/modify_subscription_router.yaml
index 5d23f4f2ba97676eeb737f0553c732aae229009d..c8ef297daa896bf9da843450ec20156d2519d8d0 100644
--- a/geant/gap_ansible/roles/ibgp_update/tasks/modify_subscription_router.yaml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/modify_subscription_router.yaml
@@ -2,12 +2,11 @@
 # We need to add all the existing PE the new P
 # P routers will always be NOKIA
 # In this case you have wfo_router as external variable
-# FIX: Load ansible_network_os via group_vars
 #
 - name: Set variable to connect to nokia
   ansible.builtin.set_fact:
-    ansible_network_os: geant.gap_ansible.sros
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[subscription.router.vendor].ansible_network_os }}"
 
 - name: Set ansible_host to terminal server when router is offline
   ansible.builtin.set_fact: