diff --git a/manifests/function/k8scontrol-capd/cluster.yaml b/manifests/function/k8scontrol-capd/cluster.yaml
index e831f3d65..fe15c29c0 100644
--- a/manifests/function/k8scontrol-capd/cluster.yaml
+++ b/manifests/function/k8scontrol-capd/cluster.yaml
@@ -15,12 +15,10 @@ spec:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     kind: DockerCluster
     name: "target-cluster"
-    namespace: default
   controlPlaneRef:
     kind: KubeadmControlPlane
     apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
     name: "target-cluster-control-plane"
-    namespace: default
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
 kind: DockerCluster
diff --git a/manifests/function/k8scontrol-capd/controlplane.yaml b/manifests/function/k8scontrol-capd/controlplane.yaml
index e7c6a7809..479536691 100644
--- a/manifests/function/k8scontrol-capd/controlplane.yaml
+++ b/manifests/function/k8scontrol-capd/controlplane.yaml
@@ -22,7 +22,6 @@ spec:
     kind: DockerMachineTemplate
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     name: "target-cluster-control-plane"
-    namespace: default
   kubeadmConfigSpec:
     clusterConfiguration:
       controllerManager:
diff --git a/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml b/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
index 3ae6b1dfa..0456d36a6 100644
--- a/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/site/docker-test-site/ephemeral/controlplane/kustomization.yaml
@@ -2,6 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../function/k8scontrol-capd
+  - namespace.yaml
+
+namespace: target-infra
 
 patchesJson6902:
   - target:
diff --git a/manifests/site/docker-test-site/ephemeral/controlplane/namespace.yaml b/manifests/site/docker-test-site/ephemeral/controlplane/namespace.yaml
new file mode 100644
index 000000000..b32028483
--- /dev/null
+++ b/manifests/site/docker-test-site/ephemeral/controlplane/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: target-infra