diff --git a/manifests/function/phase-helpers/kustomization.yaml b/manifests/function/phase-helpers/kustomization.yaml
new file mode 100644
index 000000000..c27d68b66
--- /dev/null
+++ b/manifests/function/phase-helpers/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- wait_node
\ No newline at end of file
diff --git a/manifests/site/test-site/phases/helpers/kubectl_get_node.sh b/manifests/function/phase-helpers/wait_node/kubectl_wait_node.sh
similarity index 100%
rename from manifests/site/test-site/phases/helpers/kubectl_get_node.sh
rename to manifests/function/phase-helpers/wait_node/kubectl_wait_node.sh
diff --git a/manifests/site/test-site/phases/helpers/kustomization.yaml b/manifests/function/phase-helpers/wait_node/kustomization.yaml
similarity index 75%
rename from manifests/site/test-site/phases/helpers/kustomization.yaml
rename to manifests/function/phase-helpers/wait_node/kustomization.yaml
index c5ce0a797..1427e2d9a 100644
--- a/manifests/site/test-site/phases/helpers/kustomization.yaml
+++ b/manifests/function/phase-helpers/wait_node/kustomization.yaml
@@ -3,4 +3,4 @@ configMapGenerator:
   options:
     disableNameSuffixHash: true
   files:
-  - script=kubectl_get_node.sh
+  - script=kubectl_wait_node.sh
diff --git a/manifests/phases/kustomization.yaml b/manifests/phases/kustomization.yaml
index c24b42d19..8b48bb484 100644
--- a/manifests/phases/kustomization.yaml
+++ b/manifests/phases/kustomization.yaml
@@ -5,6 +5,8 @@ resources:
   - cluster-map.yaml
   - ../function/clusterctl
   - ../function/airshipctl-base-catalogues
+  # Scripts for generic containers
+  - ../function/phase-helpers
 patchesStrategicMerge:
   - clusterctl_init_options.yaml
 transformers:
diff --git a/manifests/phases/phases.yaml b/manifests/phases/phases.yaml
index 51e813738..9e8ca7f64 100644
--- a/manifests/phases/phases.yaml
+++ b/manifests/phases/phases.yaml
@@ -282,7 +282,7 @@ config:
 apiVersion: airshipit.org/v1alpha1
 kind: Phase
 metadata:
-  name: kubectl-get-node-ephemeral
+  name: kubectl-wait-node-ephemeral
   clusterName: ephemeral-cluster
 config:
   executorRef:
diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml
index aa67ae5ad..55159500e 100644
--- a/manifests/site/test-site/phases/kustomization.yaml
+++ b/manifests/site/test-site/phases/kustomization.yaml
@@ -2,6 +2,5 @@ resources:
   - ../kubeconfig
   - ../../../phases
   - catalogue.yaml
-  - helpers
 transformers:
   - ../../../function/bootstrap/replacements
diff --git a/tools/deployment/25_deploy_ephemeral_node.sh b/tools/deployment/25_deploy_ephemeral_node.sh
index 7969ff91e..133eb3174 100755
--- a/tools/deployment/25_deploy_ephemeral_node.sh
+++ b/tools/deployment/25_deploy_ephemeral_node.sh
@@ -23,7 +23,7 @@ echo "Deploy ephemeral node using redfish with iso"
 airshipctl phase run remotedirect-ephemeral --debug
 
 echo "Wait for apiserver to become available"
-airshipctl phase run kubectl-get-node-ephemeral
+airshipctl phase run kubectl-wait-node-ephemeral
 
 echo "List all pods"
 kubectl --kubeconfig $KUBECONFIG --context $KUBECONFIG_EPHEMERAL_CONTEXT get pods --all-namespaces