diff --git a/kind/external-secrets.yaml b/kind/external-secrets.yaml
deleted file mode 100644
index 4ef398e..0000000
--- a/kind/external-secrets.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: external-secrets
diff --git a/kind/kustomization.yaml b/kind/kustomization.yaml
index 9a49eea..5bf1a23 100644
--- a/kind/kustomization.yaml
+++ b/kind/kustomization.yaml
@@ -3,9 +3,7 @@ kind: Kustomization
 resources:
 - postgres.yaml
 - rabbitmq.yaml
-- external-secrets.yaml
-- https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-- https://github.com/jetstack/cert-manager/releases/download/v1.15.3/cert-manager.yaml
+- namespaces.yaml
 - certificates.yaml
 - secrets-store.yaml
 helmCharts:
@@ -15,3 +13,19 @@ helmCharts:
   releaseName: external-secrets
   repo: https://charts.external-secrets.io
   version: 0.18.1
+- name: cert-manager
+  namespace: cert-manager
+  includeCRDs: true
+  releaseName: cert-manager
+  repo: https://charts.jetstack.io
+  version: v1.18.0
+  valuesInline:
+    crds:
+      enabled: true
+- name: ingress-nginx
+  namespace: ingress-nginx
+  includeCRDs: true
+  releaseName: ingress-nginx
+  repo: https://kubernetes.github.io/ingress-nginx
+  version: v4.12.3
+  valuesFile: https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/hack/manifest-templates/provider/kind/values.yaml
diff --git a/kind/namespaces.yaml b/kind/namespaces.yaml
new file mode 100644
index 0000000..9dd166a
--- /dev/null
+++ b/kind/namespaces.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: external-secrets
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-nginx