1 files changed, 3 insertions, 2 deletions
diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
index 95708e888d..ae4c26a1ba 100755
--- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh
+++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
@@ -35,15 +35,16 @@ common_dirs || die
 check_prerequisites || die
 get_test_code "${1-}" || die
 get_test_tag_string || die
-select_topology || die
 select_arch_os || die
 gather_build || die
 check_download_dir || die
 activate_virtualenv || die
 generate_tests || die
 archive_tests || die
+prepare_topology || die
+select_topology || die
 activate_docker_topology || die
-select_vpp_device_tags || die
+select_tags || die
 compose_pybot_arguments || die
 set_environment_variables || die
 run_pybot || die