diff --git a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/kustomization.yaml b/k8s/distributions/kind/infrastructure/cluster-issuers/kustomization.yaml
similarity index 62%
rename from k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/kustomization.yaml
rename to k8s/distributions/kind/infrastructure/cluster-issuers/kustomization.yaml
index 045784f45..7fb99f978 100644
--- a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/kustomization.yaml
+++ b/k8s/distributions/kind/infrastructure/cluster-issuers/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - certificate.yaml
-  - cluster-issuer.yaml
+  - selfsigned-cluster-issuer.yaml
diff --git a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/cluster-issuer.yaml b/k8s/distributions/kind/infrastructure/cluster-issuers/selfsigned-cluster-issuer.yaml
similarity index 100%
rename from k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/cluster-issuer.yaml
rename to k8s/distributions/kind/infrastructure/cluster-issuers/selfsigned-cluster-issuer.yaml
diff --git a/k8s/distributions/kind/infrastructure/kustomization.yaml b/k8s/distributions/kind/infrastructure/kustomization.yaml
index f5f434fb3..9ab7a8c9a 100644
--- a/k8s/distributions/kind/infrastructure/kustomization.yaml
+++ b/k8s/distributions/kind/infrastructure/kustomization.yaml
@@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../bases/infrastructure
-  - selfsigned-cluster-issuer/
+  - cluster-issuers/
+  - traefik/
diff --git a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/README.md b/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/README.md
deleted file mode 100644
index d3148a9bb..000000000
--- a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Cert Manager - Self-Signed Cluster Issuer
-
-This cluster issuer can be used to issue self-signed certificates. It is only recommended to use this issuer for local clusters.
-
-## Dependencies
-
-- [Cert Manager](../../../../../k8s-old/shared/README.md)
diff --git a/k8s/distributions/kind/infrastructure/traefik/kustomization.yaml b/k8s/distributions/kind/infrastructure/traefik/kustomization.yaml
new file mode 100644
index 000000000..692610bce
--- /dev/null
+++ b/k8s/distributions/kind/infrastructure/traefik/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - traefik-certificate.yaml
diff --git a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/certificate.yaml b/k8s/distributions/kind/infrastructure/traefik/traefik-certificate.yaml
similarity index 72%
rename from k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/certificate.yaml
rename to k8s/distributions/kind/infrastructure/traefik/traefik-certificate.yaml
index fc896e0fc..6f48a4cf3 100644
--- a/k8s/distributions/kind/infrastructure/selfsigned-cluster-issuer/certificate.yaml
+++ b/k8s/distributions/kind/infrastructure/traefik/traefik-certificate.yaml
@@ -1,10 +1,10 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: cluster-issuer-certificate
+  name: traefik-certificate
   namespace: traefik
 spec:
-  secretName: cluster-issuer-certificate-tls
+  secretName: traefik-certificate-tls
   dnsNames:
     - "${domain}"
     - "*.${domain}"