diff --git a/playbooks/airshipctl-gate-runner.yaml b/playbooks/airshipctl-gate-runner.yaml
index d28622be7..e28b21e67 100644
--- a/playbooks/airshipctl-gate-runner.yaml
+++ b/playbooks/airshipctl-gate-runner.yaml
@@ -13,6 +13,7 @@
 - hosts: primary
   vars_files:
     - vars/test-config.yaml
+  name: airshipctl_gate_runner
   environment:
     SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
     SOPS_PGP_FP_ENCRYPT: "{{ airship_config_pgp_fp1 }}"
@@ -29,7 +30,7 @@
     GCP_NETWORK_NAME: "ZGVmYXVsdA=="
     GCP_B64ENCODED_CREDENTIALS: "bjEtc3RhbmRhcmQtNA=="
   tasks:
-    - name: "set default gate scripts"
+    - name: "set_default_gate_scripts"
       set_fact:
         gate_scripts_default:
           - ./tools/deployment/21_systemwide_executable.sh
diff --git a/tools/gate/20_run_gate_runner.sh b/tools/gate/20_run_gate_runner.sh
index 462146aef..ccf81c2d0 100755
--- a/tools/gate/20_run_gate_runner.sh
+++ b/tools/gate/20_run_gate_runner.sh
@@ -80,9 +80,9 @@ while true; do
   esac
 done
 
-SCRIPT_LIST=$(cat $ZUUL_JOBS_PATH | yq '.[9].job.vars.gate_scripts[]' -c -r)
+SCRIPT_LIST=$(cat $ZUUL_JOBS_PATH | yq '.[] | select(.job.name == "airship-airshipctl-gate-script-runner") | .job.vars.gate_scripts[]' -c -r)
 if [[ ! $SCRIPT_LIST ]]; then
-  SCRIPT_LIST=$(cat $GATE_RUNNER_YAML_PATH | yq '.[0].tasks[0].set_fact.deploy_test_site_scripts_default[]' -c -r)
+  SCRIPT_LIST=$(cat $GATE_RUNNER_YAML_PATH | yq '.[]| select (.name=="airshipctl_gate_runner")| .tasks[]| select (.name=="set_default_gate_scripts")| .set_fact.gate_scripts_default[]' -c -r)
 fi
 
 SKIP_LIST=$(echo ${SKIP_LIST//,/ })