diff --git a/manifests/function/k8scontrol-ha/kustomization.yaml b/manifests/function/k8scontrol-ha/kustomization.yaml
index f572c7b81..8967b5041 100644
--- a/manifests/function/k8scontrol-ha/kustomization.yaml
+++ b/manifests/function/k8scontrol-ha/kustomization.yaml
@@ -1,25 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
-  - ../../../../airshipctl/manifests/function/k8scontrol
-  - dex-ca-cert-secret.yaml
-
 namespace: target-infra
 
+resources:
+  - ../k8scontrol-oidc
+
 patches:
-  - target:
-      group: controlplane.cluster.x-k8s.io
-      version: v1alpha3
-      kind: KubeadmControlPlane
-    path: oidc-apiserver-ca-cert.json
   - target:
       group: controlplane.cluster.x-k8s.io
       version: v1alpha3
       kind: KubeadmControlPlane
     path:  vrrp_keepalived_patch.yaml
-  - target:
-      group: controlplane.cluster.x-k8s.io
-      version: v1alpha3
-      kind: KubeadmControlPlane
-    path: oidc-apiserver-extra-args.yaml
+
diff --git a/manifests/function/k8scontrol-ha/replacements/kustomization.yaml b/manifests/function/k8scontrol-ha/replacements/kustomization.yaml
index 488d4922c..b43e0d9ae 100644
--- a/manifests/function/k8scontrol-ha/replacements/kustomization.yaml
+++ b/manifests/function/k8scontrol-ha/replacements/kustomization.yaml
@@ -1,4 +1,3 @@
 resources:
-  - ../../../../../airshipctl/manifests/function/k8scontrol/replacements
+  - ../../k8scontrol-oidc/replacements
   - networking-ha.yaml
-  - update-dex.yaml
diff --git a/manifests/function/k8scontrol-ha/dex-ca-cert-secret.yaml b/manifests/function/k8scontrol-oidc/dex-ca-cert-secret.yaml
similarity index 100%
rename from manifests/function/k8scontrol-ha/dex-ca-cert-secret.yaml
rename to manifests/function/k8scontrol-oidc/dex-ca-cert-secret.yaml
diff --git a/manifests/function/k8scontrol-oidc/kustomization.yaml b/manifests/function/k8scontrol-oidc/kustomization.yaml
new file mode 100644
index 000000000..cfbd5557d
--- /dev/null
+++ b/manifests/function/k8scontrol-oidc/kustomization.yaml
@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../../airshipctl/manifests/function/k8scontrol
+  - dex-ca-cert-secret.yaml
+
+patches:
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1alpha3
+      kind: KubeadmControlPlane
+    path: oidc-apiserver-ca-cert.json
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1alpha3
+      kind: KubeadmControlPlane
+    path: oidc-apiserver-extra-args.yaml
+
diff --git a/manifests/function/k8scontrol-ha/oidc-apiserver-ca-cert.json b/manifests/function/k8scontrol-oidc/oidc-apiserver-ca-cert.json
similarity index 100%
rename from manifests/function/k8scontrol-ha/oidc-apiserver-ca-cert.json
rename to manifests/function/k8scontrol-oidc/oidc-apiserver-ca-cert.json
diff --git a/manifests/function/k8scontrol-ha/oidc-apiserver-extra-args.yaml b/manifests/function/k8scontrol-oidc/oidc-apiserver-extra-args.yaml
similarity index 100%
rename from manifests/function/k8scontrol-ha/oidc-apiserver-extra-args.yaml
rename to manifests/function/k8scontrol-oidc/oidc-apiserver-extra-args.yaml
diff --git a/manifests/function/k8scontrol-oidc/replacements/kustomization.yaml b/manifests/function/k8scontrol-oidc/replacements/kustomization.yaml
new file mode 100644
index 000000000..d2a53570a
--- /dev/null
+++ b/manifests/function/k8scontrol-oidc/replacements/kustomization.yaml
@@ -0,0 +1,3 @@
+resources:
+  - ../../../../../airshipctl/manifests/function/k8scontrol/replacements
+  - update-dex.yaml
diff --git a/manifests/function/k8scontrol-ha/replacements/update-dex.yaml b/manifests/function/k8scontrol-oidc/replacements/update-dex.yaml
similarity index 100%
rename from manifests/function/k8scontrol-ha/replacements/update-dex.yaml
rename to manifests/function/k8scontrol-oidc/replacements/update-dex.yaml
diff --git a/manifests/type/sub-cluster/controlplane/kustomization.yaml b/manifests/type/sub-cluster/controlplane/kustomization.yaml
index 5b192f5ec..a7d2b00d1 100644
--- a/manifests/type/sub-cluster/controlplane/kustomization.yaml
+++ b/manifests/type/sub-cluster/controlplane/kustomization.yaml
@@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../airshipctl/manifests/function/k8scontrol
+  # Switch to this once we want to add Dex back in
+  #- ../../../function/k8scontrol-oidc
 
 patchesJson6902:
 - target: