diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/ingress-apps/argocd-server.yaml
index 0446b6c..f2ec56d 100644
--- a/template/stacks/core/ingress-apps/argocd-server.yaml
+++ b/template/stacks/core/ingress-apps/argocd-server.yaml
@@ -11,6 +11,11 @@ metadata:
     dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}}
     dns.gardener.cloud/ttl: "600"
 {{{ end }}}
+{{{ if eq .Env.CLUSTER_TYPE "kind" }}}
+    external-dns.alpha.kubernetes.io/hostname: {{{ .Env.DOMAIN }}}
+    external-dns.alpha.kubernetes.io/target: "127.0.0.1"
+{{{ end }}}
+    cert-manager.io/cluster-issuer: letsencrypt-prod
   name: argocd-server
   namespace: argocd
 spec:
diff --git a/template/stacks/core/ingress-apps/forgejo.yaml b/template/stacks/core/ingress-apps/forgejo.yaml
index 3143875..736abea 100644
--- a/template/stacks/core/ingress-apps/forgejo.yaml
+++ b/template/stacks/core/ingress-apps/forgejo.yaml
@@ -9,6 +9,11 @@ metadata:
     dns.gardener.cloud/dnsnames: gitea.{{{ .Env.DOMAIN }}}
     dns.gardener.cloud/ttl: "600"
 {{{ end }}}
+{{{ if eq .Env.CLUSTER_TYPE "kind" }}}
+    external-dns.alpha.kubernetes.io/hostname: gitea.{{{ .Env.DOMAIN }}}
+    external-dns.alpha.kubernetes.io/target: "127.0.0.1"
+{{{ end }}}
+    cert-manager.io/cluster-issuer: letsencrypt-prod
   name: forgejo
   namespace: gitea
 spec: