diff --git a/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml b/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml
index f247eb3201e13126729e1d6753dbf7e611e9d584..b6ad21f819ad82071996a31bf303d55a77fe2abe 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml
+++ b/geant/gap_ansible/roles/promote_p_to_pe/vars/main.yml
@@ -20,17 +20,46 @@ router_tier: "{{ subscription.router.router_site.site_tier }}"
 router_role: "{{ subscription.router.router_role }}"
 
 post_check_commands:
-  - command: show router * route-table summary
-    description: Route summary
-  - command: show router ldp session
-    description: Check ldp
+  - command: show router route-table summary | match ISIS
+  - command: show router isis interface | match '^[a-z]'
+  - command: show router isis adjacency | match '^[a-z]'
+  - command: show router mpls interface | match '^[a-z]'
+  - command: show router rsvp interface | match '^[a-z]'
+  - command: show router rsvp neighbor | match '^[1-9]'
+  - command: show router rsvp session | match "Up"
+  - command: show router pim interface | match "Up"
+  - command: show router pim neighbor | match '^[a-z|A-Z]'
+  - command: show router pim status | match '(State|RPF Table)'
+  - command: show router pim group | match '^[1-9]' | no-more
+  - command: show router route-table mcast-ipv4 summary
+  - command: show router route-table mcast-ipv6 summary
+  - command: show router bgp summary group "iGEANT"
+  - command: show router bgp summary group "iGEANT6"
+  - command: show router bgp summary group "iGEANT-P-ONLY"
+  - command: show router bgp summary group "iGEANT6-P-ONLY"
   - command: show service sdp
-    description: SDP summary
-  - command: show router origin-validation rpki-session
-    description: Show RPKI sessions
+  - command: show router route-table 0.0.0.0/0
+  - command: show router route-table ::/0
+  - command: show router Base route-table summary
+  - command: show router 21320 route-table summary
+  - command: show cflowd status | match '(Timeout|Retrans)'
+  - command: show cflowd collector | match '^[0-9]'
+  - command: show router Base origin-validation rpki-session detail
+  - command: show router Base bgp routes 5.150.67.0/24 detail | match '(Network|Final|Community|Attri)'
+  - command: show router Base bgp routes community ext:4300:0 | count
+  - command: show router Base bgp routes community ext:4300:1 | count
 
 pre_check_commands:
-  - command: show router * route-table summary
   - command: show router route-table summary | match ISIS
   - command: show router isis interface | match '^[a-z]'
   - command: show router isis adjacency | match '^[a-z]'
+  - command: show router mpls interface | match '^[a-z]'
+  - command: show router rsvp interface | match '^[a-z]'
+  - command: show router rsvp neighbor | match '^[1-9]'
+  - command: show router rsvp session | match "Up"
+  - command: show router pim interface | match "Up"
+  - command: show router pim neighbor | match '^[a-z|A-Z]'
+  - command: show router pim status | match '(State|RPF Table)'
+  - command: show router pim group | match '^[1-9]' | no-more
+  - command: show router route-table mcast-ipv4 summary
+  - command: show router route-table mcast-ipv6 summary