diff --git a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
index 0330f464f3c8fae1f3a88a4860a389c586a46699..8b109a0e8327d34d521252178f8f76c68394ec34 100644
--- a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
+++ b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml
@@ -9,7 +9,20 @@
   when: subscription.product.product_type == 'L3CoreService'
   ansible.builtin.set_fact:
     router: "{{ ap.sbp.edge_port.node }}"
-    vendor: "{{ router.vendor }}"
+    vendor: "{{ ap.sbp.edge_port.node.vendor }}"
+
+- name: Extract current inventory router from "vrf_router_list"
+  when: subscription.product.product_type == 'VRF'
+  ansible.builtin.set_fact:
+    current_router: "{{ vrf_router_list | community.general.json_query(query) }}"
+  vars:
+    query: "[?router.router_fqdn == '{{ inventory_hostname }}'] | [0]"
+
+- name: Set router and vendor for the use with VRF update
+  when: subscription.product.product_type == 'VRF'
+  ansible.builtin.set_fact:
+    router: "{{ current_router.router }}"
+    vendor: "{{ current_router.router.vendor }}"
 
 - name: Assemble the config from fragments in previous roles
   ansible.builtin.include_tasks: assemble_config.yml
diff --git a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
index 5def5f74b90481c8b0e62b06a281ee954dc18eba..60eb6cd460f0fefd2f0d97a563dbf9b70bbdf442 100644
--- a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
+++ b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml
@@ -2,6 +2,6 @@
 # vars file for deploy_service_config
 dry_run: true
 is_verification_workflow: false
-
-router: "{{ ap.sbp.edge_port.node }}"
-vendor: "{{ router.vendor }}"
+#
+# router: "{{ ap.sbp.edge_port.node }}"
+# vendor: "{{ router.vendor }}"