diff --git a/manifests/type/airship-core/phases/kubeconfig.yaml b/manifests/site/test-site/kubeconfig/kubeconfig.yaml
similarity index 100%
rename from manifests/type/airship-core/phases/kubeconfig.yaml
rename to manifests/site/test-site/kubeconfig/kubeconfig.yaml
diff --git a/manifests/site/test-site/kubeconfig/kustomization.yaml b/manifests/site/test-site/kubeconfig/kustomization.yaml
new file mode 100644
index 000000000..d48a7b893
--- /dev/null
+++ b/manifests/site/test-site/kubeconfig/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - kubeconfig.yaml
diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml
index b0c2dcbd5..00840503a 100644
--- a/manifests/site/test-site/phases/kustomization.yaml
+++ b/manifests/site/test-site/phases/kustomization.yaml
@@ -1,2 +1,3 @@
 resources:
+  - ../kubeconfig
   - ../../../type/airship-core/phases
diff --git a/manifests/site/test-site/target/catalogues/hosts.yaml b/manifests/site/test-site/target/catalogues/hosts.yaml
index abbf90e45..fa7052389 100644
--- a/manifests/site/test-site/target/catalogues/hosts.yaml
+++ b/manifests/site/test-site/target/catalogues/hosts.yaml
@@ -15,6 +15,7 @@ hosts:
       bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-target-1
       bmcUsername: root
       bmcPassword: r00tme
+      disableCertificateVerification: false
       ipAddresses:
         oam-ipv4: 10.23.25.102
         pxe-ipv4: 10.23.24.102
@@ -28,6 +29,7 @@ hosts:
       bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2
       bmcUsername: username
       bmcPassword: password
+      disableCertificateVerification: false
       ipAddresses:
         oam-ipv4: 10.23.25.101
         pxe-ipv4: 10.23.24.101
@@ -41,6 +43,7 @@ hosts:
       bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-worker-1
       bmcUsername: username
       bmcPassword: password
+      disableCertificateVerification: false
       ipAddresses:
         oam-ipv4: 10.23.25.103
         pxe-ipv4: 10.23.24.103
diff --git a/manifests/type/airship-core/phases/cluster-map.yaml b/manifests/type/airship-core/phases/cluster-map.yaml
deleted file mode 100644
index abe571572..000000000
--- a/manifests/type/airship-core/phases/cluster-map.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: airshipit.org/v1alpha1
-kind: ClusterMap
-metadata:
-  labels:
-    airshipit.org/deploy-k8s: "false"
-  name: main-map
-map:
-  target-cluster:
-    parent: ephemeral-cluster
-  ephemeral-cluster: {}
diff --git a/manifests/type/airship-core/phases/clusterctl_init_options.yaml b/manifests/type/airship-core/phases/clusterctl_init_options.yaml
deleted file mode 100644
index 3759b3685..000000000
--- a/manifests/type/airship-core/phases/clusterctl_init_options.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: airshipit.org/v1alpha1
-kind: Clusterctl
-metadata:
-  name: clusterctl_init
-action: init
diff --git a/manifests/type/airship-core/phases/executors.yaml b/manifests/type/airship-core/phases/executors.yaml
deleted file mode 100644
index f63073c14..000000000
--- a/manifests/type/airship-core/phases/executors.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-apiVersion: airshipit.org/v1alpha1
-kind: KubernetesApply
-metadata:
-  labels:
-    airshipit.org/deploy-k8s: "false"
-  name: kubernetes-apply
-config:
-  waitOptions:
-    timeout: 2000
-  pruneOptions:
-    prune: false
----
-# This is added to support phase with no-wait
-# When there is a wait, then it does status-check and fails
-# if the resource status(condition) is not met.
-# There are cases where the resource do not have status
-# field implemented. So a wait will fail with status check
-apiVersion: airshipit.org/v1alpha1
-kind: KubernetesApply
-metadata:
-  labels:
-    airshipit.org/deploy-k8s: "false"
-  name: kubernetes-apply-nowait
-config:
-  waitOptions:
-    timeout: 0
-  pruneOptions:
-    prune: false
----
-apiVersion: airshipit.org/v1alpha1
-kind: Clusterctl
-metadata:
-  name: clusterctl_move
-move-options: {}
-action: move
----
-apiVersion: airshipit.org/v1alpha1
-kind: IsoConfiguration
-metadata:
-  name: isogen
-  labels:
-    airshipit.org/deploy-k8s: "false"
-builder:
-  outputFileName: ephemeral.iso
-container:
-  containerRuntime: docker
-  image: quay.io/airshipit/image-builder:latest-ubuntu_focal
-  volume: /srv/images:/config
diff --git a/manifests/type/airship-core/phases/kustomization.yaml b/manifests/type/airship-core/phases/kustomization.yaml
index b4fdd41c5..865393d92 100644
--- a/manifests/type/airship-core/phases/kustomization.yaml
+++ b/manifests/type/airship-core/phases/kustomization.yaml
@@ -1,9 +1,2 @@
 resources:
-  - phases.yaml
-  - plan.yaml
-  - executors.yaml
-  - cluster-map.yaml
-  - kubeconfig.yaml
-  - ../../../function/clusterctl
-patchesStrategicMerge:
-  - clusterctl_init_options.yaml
+  - ../../../../../airshipctl/manifests/phases/
diff --git a/manifests/type/airship-core/phases/phases.yaml b/manifests/type/airship-core/phases/phases.yaml
deleted file mode 100644
index 8f7d3fcda..000000000
--- a/manifests/type/airship-core/phases/phases.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: bootstrap-iso
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: IsoConfiguration
-    name: isogen
-  documentEntryPoint: ephemeral/bootstrap
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: initinfra-ephemeral
-  clusterName: ephemeral-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: ephemeral/initinfra
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: initinfra-networking-ephemeral
-  clusterName: ephemeral-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply-nowait
-  documentEntryPoint: ephemeral/initinfra-networking
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: controlplane-ephemeral
-  clusterName: ephemeral-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: ephemeral/controlplane
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: initinfra-target
-  clusterName: target-cluster
-config:
-  cluster: target-cluster
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/initinfra
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: initinfra-networking-target
-  clusterName: target-cluster
-config:
-  cluster: target-cluster
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply-nowait
-  documentEntryPoint: target/initinfra-networking
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: workers-target
-  clusterName: target-cluster
-config:
-  cluster: target-cluster
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/workers
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: clusterctl-init-ephemeral
-  clusterName: ephemeral-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: Clusterctl
-    name: clusterctl_init
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: clusterctl-init-target
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: Clusterctl
-    name: clusterctl_init
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: clusterctl-move
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: Clusterctl
-    name: clusterctl_move
----
-apiVersion: airshipit.org/v1alpha1
-kind: Phase
-metadata:
-  name: workload-target
-  clusterName: target-cluster
-config:
-  executorRef:
-    apiVersion: airshipit.org/v1alpha1
-    kind: KubernetesApply
-    name: kubernetes-apply
-  documentEntryPoint: target/workload
diff --git a/manifests/type/airship-core/phases/plan.yaml b/manifests/type/airship-core/phases/plan.yaml
deleted file mode 100644
index 2cf9067a6..000000000
--- a/manifests/type/airship-core/phases/plan.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: airshipit.org/v1alpha1
-kind: PhasePlan
-metadata:
-  name: phasePlan
-phaseGroups:
-  - name: group1
-    phases:
-      - name: initinfra-ephemeral
-      - name: initinfra-networking-ephemeral
-      - name: clusterctl-init-ephemeral
-      - name: controlplane-ephemeral
-      - name: initinfra-target
-      - name: initinfra-networking-target
-      - name: workers-target
-      - name: workload-target