diff --git a/manifests/site/docker-test-site/target/controlplane/kustomization.yaml b/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
similarity index 100%
rename from manifests/site/docker-test-site/target/controlplane/kustomization.yaml
rename to manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
diff --git a/manifests/site/docker-test-site/target/controlplane/machine_count.json b/manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json
similarity index 100%
rename from manifests/site/docker-test-site/target/controlplane/machine_count.json
rename to manifests/site/docker-test-site/ephemeral/controlplane/machine_count.json
diff --git a/manifests/site/docker-test-site/phases/plan.yaml b/manifests/site/docker-test-site/phases/plan.yaml
index 116cc8b3f..ceebf9779 100644
--- a/manifests/site/docker-test-site/phases/plan.yaml
+++ b/manifests/site/docker-test-site/phases/plan.yaml
@@ -6,6 +6,7 @@ phaseGroups:
   - name: group1
     phases:
       - name: clusterctl-init-ephemeral
-      - name: controlplane-target
-      - name: workers-target
+      - name: controlplane-ephemeral
       - name: clusterctl-init-target
+      - name: clusterctl-move
+      - name: workers-target
diff --git a/manifests/site/docker-test-site/target/initinfra/kustomization.yaml b/manifests/site/docker-test-site/target/initinfra/kustomization.yaml
deleted file mode 100644
index c2942afaa..000000000
--- a/manifests/site/docker-test-site/target/initinfra/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resources:
-  - ../../shared/clusterctl
-commonLabels:
-  airshipit.org/stage: initinfra