diff --git a/playbooks/airship-treasuremap-gate-runner.yaml b/playbooks/airship-treasuremap-gate-runner.yaml
index 5351ed13d..43f577496 100644
--- a/playbooks/airship-treasuremap-gate-runner.yaml
+++ b/playbooks/airship-treasuremap-gate-runner.yaml
@@ -21,14 +21,14 @@
     - name: "set default gate scripts"
       set_fact:
         gate_scripts_default:
-          - ./tools/deployment/01_install_kubectl.sh
+          - ./tools/deployment/01_install_essentials.sh
           - ./tools/deployment/21_systemwide_executable.sh
           - ./tools/deployment/22_test_configs.sh
           - ./tools/deployment/23_pull_documents.sh
           - ./tools/deployment/23_generate_secrets.sh
-          - ./tools/deployment/24_build_ephemeral_iso.sh
+          - ./tools/deployment/24_build_images.sh
           - ./tools/deployment/25_deploy_ephemeral_node.sh
-          - ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
+          - ./tools/deployment/26_deploy_capi_ephemeral_node.sh
           - ./tools/deployment/30_deploy_controlplane.sh
           - ./tools/deployment/31_deploy_initinfra_target_node.sh
           - ./tools/deployment/32_cluster_init_target_node.sh
diff --git a/tools/deployment/01_install_essentials.sh b/tools/deployment/01_install_essentials.sh
new file mode 100755
index 000000000..e78a891dc
--- /dev/null
+++ b/tools/deployment/01_install_essentials.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -xe
+
+: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
+
+cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/provider_common/03_install_pip.sh
+./tools/deployment/provider_common/04_install_yq.sh
+./tools/deployment/01_install_kubectl.sh
diff --git a/tools/deployment/01_install_kubectl.sh b/tools/deployment/36_verify_hwcc_profiles.sh
similarity index 92%
rename from tools/deployment/01_install_kubectl.sh
rename to tools/deployment/36_verify_hwcc_profiles.sh
index 59e7191b9..94f94ee75 100755
--- a/tools/deployment/01_install_kubectl.sh
+++ b/tools/deployment/36_verify_hwcc_profiles.sh
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -xe
+set -ex
 
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
 cd ${AIRSHIPCTL_PROJECT}
-./tools/deployment/01_install_kubectl.sh
+./tools/deployment/36_verify_hwcc_profiles.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d34dce05d..f401316c2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -32,7 +32,7 @@
     nodeset: airship-treasuremap-single-node
     vars:
       gate_scripts:
-        - ./tools/deployment/01_install_kubectl.sh
+        - ./tools/deployment/01_install_essentials.sh
         - ./tools/deployment/21_systemwide_executable.sh
         - ./tools/deployment/22_test_configs.sh
         - ./tools/deployment/23_pull_documents.sh
@@ -70,7 +70,7 @@
       # airshipctl_ref: ""
       site_name: test-site
       gate_scripts:
-        - ./tools/deployment/01_install_kubectl.sh
+        - ./tools/deployment/01_install_essentials.sh
         - ./tools/deployment/22_test_configs.sh
         - ./tools/deployment/23_pull_documents.sh
         - ./tools/deployment/23_generate_secrets.sh