-| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | ${1}
-| | Apply startup configuration on all VPP DUTs | restart_vpp=${FALSE}
+| | | ${socket_id}= | Set Variable | ${0}
+| | | ${sw_dev_count}= | Set Variable | ${1}
+| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_mb | ${socket_id}
+| | | ... | ${sw_dev_count}
+| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_gcm | ${socket_id}
+| | | ... | ${sw_dev_count}
+| | Write startup configuration on all VPP DUTs