-| Suite Setup | Run Keywords | Setup performance global Variables
-| ... | AND | Setup Framework | ${nodes}
-| ... | AND | Setup All DUTs | ${nodes}
-| ... | AND | Get CPU Layout from all nodes | ${nodes}
-| ... | AND | Update All Interface Data On All Nodes
-| ... | ${nodes} | skip_tg=${True} | numa_node=${True}
+|
+| Suite Setup | Run Keywords | Start Suite Setup Export
+| ... | AND | Setup Global Variables
+| ... | AND | Setup Framework | ${nodes}
+| ... | AND | Setup Corekeeper on All Nodes | ${nodes}
+| ... | AND | Install Vpp on All Duts | ${nodes} | ${packages_dir}
+| ... | AND | Verify Vpp on All Duts | ${nodes}
+| ... | AND | Verify UIO Driver on all DUTs | ${nodes}
+| ... | AND | Show Vpp Version on All Duts | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
+| ... | AND | Update All Interface Data on All Nodes | ${nodes}
+| ... | skip_tg=${True}
+| ... | AND | Finalize Suite Setup Export
+|
+| Suite Teardown | Run Keywords | Start Suite Teardown Export
+| ... | AND | Disconnect All Papi Connections
+| ... | AND | Cleanup Framework | ${nodes}
+| ... | AND | Finalize Suite Teardown Export