diff --git a/manifests/function/dex-aio/dex-helmrelease.yaml b/manifests/function/dex-aio/dex-helmrelease.yaml
index 6d8875f59..c3067525b 100644
--- a/manifests/function/dex-aio/dex-helmrelease.yaml
+++ b/manifests/function/dex-aio/dex-helmrelease.yaml
@@ -57,11 +57,11 @@ spec:
           https: 30556
           http: 30554
           k8s: 8443
-        nodePort:
-          https: 30556
-          http: 30554
       oidc:
         client_id: function-kubernetes
         client_secret: pUBnBOY80SnXgjibTYM9ZWNzY2xreNGQok
-      service:
-        type: NodePort
+      tls:
+        cert_manager: true
+        issuer:
+          name: dex-ca-issuer
+          kind: ClusterIssuer
\ No newline at end of file
diff --git a/manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/README.md b/manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/README.md
similarity index 100%
rename from manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/README.md
rename to manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/README.md
diff --git a/manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/apiserver-certs-secret.yaml b/manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/apiserver-certs-secret.yaml
similarity index 100%
rename from manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/apiserver-certs-secret.yaml
rename to manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/apiserver-certs-secret.yaml
diff --git a/manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/oidc-apiserver-flags.json b/manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/oidc-apiserver-flags.json
similarity index 100%
rename from manifests/type/multi-tenant/ephemeral/controlplane/dex-apiserver/oidc-apiserver-flags.json
rename to manifests/type/airship-core/ephemeral/controlplane/dex-apiserver/oidc-apiserver-flags.json
diff --git a/manifests/type/airship-core/ephemeral/controlplane/kustomization.yaml b/manifests/type/airship-core/ephemeral/controlplane/kustomization.yaml
index f5f94e51f..1101e5947 100644
--- a/manifests/type/airship-core/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/type/airship-core/ephemeral/controlplane/kustomization.yaml
@@ -2,3 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../../airshipctl/manifests/function/k8scontrol
+  - dex-apiserver/apiserver-certs-secret.yaml
+
+patchesJson6902:
+- target:
+    group: controlplane.cluster.x-k8s.io
+    version: v1alpha3
+    kind: KubeadmControlPlane
+    name: cluster-controlplane
+  path: dex-apiserver/oidc-apiserver-flags.json
diff --git a/manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml b/manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml
index bf7a010c0..1da566259 100644
--- a/manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/type/multi-tenant/ephemeral/controlplane/kustomization.yaml
@@ -2,12 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../airship-core/ephemeral/controlplane
-  - dex-apiserver/apiserver-certs-secret.yaml
-
-patchesJson6902:
-- target:
-    group: controlplane.cluster.x-k8s.io
-    version: v1alpha3
-    kind: KubeadmControlPlane
-    name: cluster-controlplane
-  path: dex-apiserver/oidc-apiserver-flags.json