diff --git a/geant/gap_ansible/playbooks/l3_core_service.yaml b/geant/gap_ansible/playbooks/l3_core_service.yaml
index 2223bb6c59951652373a17eaefb236297e228269..67139f81ab809941dfe0a2b786b3c34921ac06b9 100644
--- a/geant/gap_ansible/playbooks/l3_core_service.yaml
+++ b/geant/gap_ansible/playbooks/l3_core_service.yaml
@@ -3,13 +3,16 @@
   gather_facts: false
   tasks:
     - name: Check SBP
+      # FIX: rewrite
       when: verb == 'check'
-      ansible.builtin.include_role:
-        name: service_checks
-      loop:
-        "{{ subscription.l3_core_service.ap_list }}"
-      loop_control:
-        loop_var: ap
+      ansible.builtin.meta: end_play
+
+      # ansible.builtin.include_role:
+      #   name: service_checks
+      # loop:
+      #   "{{ subscription.l3_core_service.ap_list }}"
+      # loop_control:
+      #   loop_var: ap
 
     # - name: Check BGP
     #   # FIX: rewrite
@@ -42,10 +45,13 @@
       ansible.builtin.include_vars:
         dir: /opt/ansible_inventory/geant_services/{{ subscription.product.product_type }}/{{ subscription.l3_core_service_type | replace(' ', '_') }}
 
-    - name: Import partner specific variables for "{{ partner_name | upper }}"
+    - name: Import {{ partner_name | upper }} general variables
       ansible.builtin.include_vars:
-        dir: /opt/ansible_inventory/geant_partners/{{ partner_name | upper }}
+        file: /opt/ansible_inventory/geant_partners/{{ partner_name | upper }}/general.yaml
 
+    - name: Import {{ partner_name | upper }} specific variables for {{ subscription.l3_core_service_type | replace(' ', '_') }}
+      ansible.builtin.include_vars:
+        dir: /opt/ansible_inventory/geant_partners/{{ partner_name | upper }}/{{ subscription.l3_core_service_type | replace(' ', '_') }}
 
     - name: Compile SBP-related config
       when: object == 'sbp'
@@ -66,20 +72,11 @@
           loop_control:
             loop_var: ap
 
-    # - name: Compile SBP config
-    #   block:
-    #     - name: Include SBP role
-    #       ansible.builtin.include_role:
-    #         name: sbp
-    #       loop:
-    #         "{{ subscription.l3_core_service.ap_list }}"
-    #       loop_control:
-    #         loop_var: ap
-    #
     - name: Compile BGP-related config
       when: object == "bgp"
       block:
         - name: Include Prefix-list role
+          when: subscription.l3_core_service_type in ["GÉANT IP", "GEANT IP", "GEANT_IP"]
           ansible.builtin.include_role:
             name: po_prefix_lists
           loop:
@@ -103,25 +100,6 @@
           loop_control:
             loop_var: ap
 
-    # - name: Compile BGP policies
-    #   block:
-    #     - name: Include BGP policies
-    #       ansible.builtin.include_role:
-    #         name: policy_options
-    #       loop:
-    #         "{{ subscription.l3_core_service.ap_list }}"
-    #       loop_control:
-    #         loop_var: ap
-    #
-    # - name: Compile BGP sesssions config
-    #   block:
-    #     - name: Include BGP session
-    #       ansible.builtin.include_role:
-    #         name: bgp_config
-    #       loop:
-    #         "{{ subscription.l3_core_service.ap_list }}"
-    #       loop_control:
-    #         loop_var: ap
 
     - name: Deploy
       # when: verb == deploy
diff --git a/geant/gap_ansible/playbooks/vrf_update.yaml b/geant/gap_ansible/playbooks/vrf_update.yaml
index 37345422a347f58a4309964837691afd67eebfb4..17f26833e0eae216be77f1156e977a2bc030d578 100644
--- a/geant/gap_ansible/playbooks/vrf_update.yaml
+++ b/geant/gap_ansible/playbooks/vrf_update.yaml
@@ -22,9 +22,9 @@
       ansible.builtin.include_vars:
         dir: /opt/ansible_inventory/group_vars/all
 
-    - name: Import standard variables for "{{ subscription.product.product_type }}/{{ subscription.l3_core_service_type | upper }}"
+    - name: Import standard variables for "{{ subscription.product.product_type }}/{{ subscription.vrf.vrf_name | upper }}"
       ansible.builtin.include_vars:
-        dir: /opt/ansible_inventory/geant_services/{{ subscription.product.product_type }}/{{ subscription.l3_core_service_type | upper }}
+        dir: /opt/ansible_inventory/geant_services/{{ subscription.product.product_type }}/{{ subscription.vrf.vrf_name | upper }}
 
     - name: Compile IP prefix lists
       ansible.builtin.include_role:
@@ -41,7 +41,3 @@
     - name: Assemble and deploy generated config
       ansible.builtin.include_role:
         name: deploy_service_config
-      loop:
-        "{{ subscription.vrf.vrf_router_list }}"
-      loop_control:
-        loop_var: router