diff --git a/geant/gap_ansible/playbooks/l3_core_service.yaml b/geant/gap_ansible/playbooks/l3_core_service.yaml
index 9b1548170ddcf531ff63919da5f70968798b8324..d09db643480913a288df5d24c450869e3a87421b 100644
--- a/geant/gap_ansible/playbooks/l3_core_service.yaml
+++ b/geant/gap_ansible/playbooks/l3_core_service.yaml
@@ -2,6 +2,23 @@
   hosts: all
   gather_facts: false
   tasks:
+    - name: Check SBP
+      when: verb == 'check'
+      ansible.builtin.include_role:
+        name: service_checks
+      loop:
+        "{{ subscription.l3_core_service.ap_list }}"
+      loop_control:
+        loop_var: ap
+
+    # - name: Check BGP
+    #   # FIX: rewrite
+    #   when: >
+    #     object == 'bgp'
+    #     and
+    #     verb == 'check'
+    #   ansible.builtin.meta: end_play
+
     - name: Generate an ID for this run
       ansible.builtin.set_fact:
         opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"