diff --git a/template/stacks/core/argocd/values.kind.yaml b/template/stacks/core/argocd/values.kind.yaml
index 8df9df4..8c3cc7f 100644
--- a/template/stacks/core/argocd/values.kind.yaml
+++ b/template/stacks/core/argocd/values.kind.yaml
@@ -25,20 +25,3 @@ notifications:
 
 dex:
   enabled: false
-
-server:
-  ingress:
-    enabled: true
-    ingressClassName: nginx
-    annotations:
-      nginx.ingress.kubernetes.io/backend-protocol: HTTP
-      nginx.ingress.kubernetes.io/rewrite-target: /$2
-      nginx.ingress.kubernetes.io/use-regex: "true"
-      nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    path: /argocd(/|$)(.*)
-    pathType: ImplementationSpecific
-    extraTls:
-      - hosts:
-        - {{ .Values.edfbuilderTargetDomain }}
-        secretName: argocd-net-tls
-
diff --git a/template/stacks/core/argocd/values.osc.yaml b/template/stacks/core/argocd/values.osc.yaml
index 122234c..9563036 100644
--- a/template/stacks/core/argocd/values.osc.yaml
+++ b/template/stacks/core/argocd/values.osc.yaml
@@ -31,23 +31,3 @@ notifications:
 
 dex:
   enabled: false
-
-server:
-  ingress:
-    enabled: true
-    ingressClassName: nginx
-    annotations:
-      dns.gardener.cloud/class: garden
-      dns.gardener.cloud/dnsnames: {{ .Values.edfbuilderTargetDomain }}
-      dns.gardener.cloud/ttl: "600"
-      nginx.ingress.kubernetes.io/backend-protocol: HTTP
-      nginx.ingress.kubernetes.io/rewrite-target: /$2
-      nginx.ingress.kubernetes.io/use-regex: "true"
-      nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    path: /argocd(/|$)(.*)
-    pathType: ImplementationSpecific
-    extraTls:
-      - hosts:
-        - {{ .Values.edfbuilderTargetDomain }}
-        secretName: argocd-net-tls
-
diff --git a/template/stacks/core/forgejo/values.kind.yaml b/template/stacks/core/forgejo/values.kind.yaml
index 210f6ca..243ca82 100644
--- a/template/stacks/core/forgejo/values.kind.yaml
+++ b/template/stacks/core/forgejo/values.kind.yaml
@@ -34,23 +34,6 @@ service:
     nodePort: 32222
     externalTrafficPolicy: Local
 
-ingress:
-  # NOTE: The ingress is generated in a later step for path based routing feature See: hack/argo-cd/generate-manifests.sh
-  enabled: true
-  className: nginx
-  annotations: 
-    nginx.ingress.kubernetes.io/proxy-body-size: 512m
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-  hosts:
-    - host: gitea.{{ .Values.edfbuilderTargetDomain }}
-      paths:
-      - path: /
-        pathType: Prefix
-  tls:
-    - hosts:
-      - gitea.{{ .Values.edfbuilderTargetDomain }}
-      secretName: forgejo-net-tls
-
 image:
   pullPolicy: "IfNotPresent"
   # Overrides the image tag whose default is the chart appVersion.
diff --git a/template/stacks/core/forgejo/values.osc.yaml b/template/stacks/core/forgejo/values.osc.yaml
index 9ff2a9f..243ca82 100644
--- a/template/stacks/core/forgejo/values.osc.yaml
+++ b/template/stacks/core/forgejo/values.osc.yaml
@@ -34,26 +34,6 @@ service:
     nodePort: 32222
     externalTrafficPolicy: Local
 
-ingress:
-  # NOTE: The ingress is generated in a later step for path based routing feature See: hack/argo-cd/generate-manifests.sh
-  enabled: true
-  className: nginx
-  annotations:
-    dns.gardener.cloud/class: garden
-    dns.gardener.cloud/dnsnames: gitea.{{ .Values.edfbuilderTargetDomain }}
-    dns.gardener.cloud/ttl: "600"
-    nginx.ingress.kubernetes.io/proxy-body-size: 512m
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-  hosts:
-    - host: gitea.{{ .Values.edfbuilderTargetDomain }}
-      paths:
-      - path: /
-        pathType: Prefix
-  tls:
-    - hosts:
-      - gitea.{{ .Values.edfbuilderTargetDomain }}
-      secretName: forgejo-net-tls
-
 image:
   pullPolicy: "IfNotPresent"
   # Overrides the image tag whose default is the chart appVersion.