diff --git a/clusterctl b/clusterctl
index 2cc6746..67044e7 100755
--- a/clusterctl
+++ b/clusterctl
@@ -51,6 +51,10 @@ function apply () {
     cp "$cluster_name/install-config.yaml" "$cluster_name/install-config.yaml.bak"
   fi
 
+  # Include the cluster dir in the path for disconnected installations
+  export PATH="$PWD/$cluster_name:$PATH"
+  openshift-install version
+
   # Create installation files
   openshift-install create manifests --dir="$cluster_name"
   openshift-install create ignition-configs --dir="$cluster_name"
@@ -276,6 +280,9 @@ function shell () {
   export TF_CLI_ARGS_state_list="-state=$cluster_name/terraform.tfstate"
   export TF_CLI_ARGS_state_rm="-state=$cluster_name/terraform.tfstate"
 
+  # Include the cluster dir in the path for disconnected installations
+  export PATH="$PWD/$cluster_name:$PATH"
+
   # OpenShift
   export KUBECONFIG="$PWD/$cluster_name/auth/kubeconfig"
   export OC_BINARY="$(which oc)"