diff --git a/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml b/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml
new file mode 100644
index 0000000..71cead0
--- /dev/null
+++ b/template/stacks/core/ingress-apps/argo-workflows-ingress.yaml
@@ -0,0 +1,31 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/use-regex: "true"
+  name: argo-workflows-ingress
+  namespace: argo
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: localhost
+    http:
+      paths:
+      - backend:
+          service:
+            name: argo-server
+            port:
+              name: web
+        path: /argo-workflows(/|$)(.*)
+        pathType: ImplementationSpecific
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: argo-server
+            port:
+              name: web
+        path: /argo-workflows(/|$)(.*)
+        pathType: ImplementationSpecific
diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/ingress-apps/argocd-server.yaml
new file mode 100644
index 0000000..10b4a3a
--- /dev/null
+++ b/template/stacks/core/ingress-apps/argocd-server.yaml
@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/use-regex: "true"
+  name: argocd-server
+  namespace: argocd
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: argocd-server
+            port:
+              number: 80
+        path: /argocd(/|$)(.*)
+        pathType: ImplementationSpecific
+  tls:
+  - hosts:
+    - cnoe.localtest.me
+    secretName: argocd-net-tls
diff --git a/template/stacks/core/ingress-apps/backstage.yaml b/template/stacks/core/ingress-apps/backstage.yaml
new file mode 100644
index 0000000..7f44187
--- /dev/null
+++ b/template/stacks/core/ingress-apps/backstage.yaml
@@ -0,0 +1,28 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: backstage
+  namespace: backstage
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: localhost
+    http:
+      paths:
+      - backend:
+          service:
+            name: backstage
+            port:
+              name: http
+        path: /
+        pathType: Prefix
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: backstage
+            port:
+              name: http
+        path: /
+        pathType: Prefix
diff --git a/template/stacks/core/ingress-apps/fibonacci-service.yaml b/template/stacks/core/ingress-apps/fibonacci-service.yaml
new file mode 100644
index 0000000..c499226
--- /dev/null
+++ b/template/stacks/core/ingress-apps/fibonacci-service.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: fibonacci-service
+  namespace: fibonacci-app
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: fibonacci-service
+            port:
+              number: 9090
+        path: /fibonacci
+        pathType: Prefix
diff --git a/template/stacks/core/ingress-apps/forgejo.yaml b/template/stacks/core/ingress-apps/forgejo.yaml
new file mode 100644
index 0000000..f53b3ec
--- /dev/null
+++ b/template/stacks/core/ingress-apps/forgejo.yaml
@@ -0,0 +1,25 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: 512m
+  name: forgejo
+  namespace: gitea
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: gitea.cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: forgejo-http
+            port:
+              number: 3000
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - gitea.cnoe.localtest.me
+    secretName: forgejo-net-tls
diff --git a/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml b/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml
new file mode 100644
index 0000000..16b20c3
--- /dev/null
+++ b/template/stacks/core/ingress-apps/keycloak-ingress-localhost.yaml
@@ -0,0 +1,28 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: keycloak-ingress-localhost
+  namespace: keycloak
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: localhost
+    http:
+      paths:
+      - backend:
+          service:
+            name: keycloak
+            port:
+              name: http
+        path: /keycloak
+        pathType: ImplementationSpecific
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: keycloak
+            port:
+              name: http
+        path: /keycloak
+        pathType: ImplementationSpecific
diff --git a/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml b/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml
new file mode 100644
index 0000000..44c2b02
--- /dev/null
+++ b/template/stacks/core/ingress-apps/kube-prometheus-stack-grafana.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: kube-prometheus-stack-grafana
+  namespace: monitoring
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: kube-prometheus-stack-grafana
+            port:
+              number: 80
+        path: /grafana
+        pathType: Prefix
diff --git a/template/stacks/core/ingress-apps/manifests.yaml b/template/stacks/core/ingress-apps/manifests.yaml
deleted file mode 100644
index 67a18b3..0000000
--- a/template/stacks/core/ingress-apps/manifests.yaml
+++ /dev/null
@@ -1,219 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/use-regex: "true"
-  name: argo-workflows-ingress
-  namespace: argo
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: argo-server
-            port:
-              name: web
-        path: /argo-workflows(/|$)(.*)
-        pathType: ImplementationSpecific
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: argo-server
-            port:
-              name: web
-        path: /argo-workflows(/|$)(.*)
-        pathType: ImplementationSpecific
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/backend-protocol: HTTP
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/use-regex: "true"
-  name: argocd-server
-  namespace: argocd
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: argocd-server
-            port:
-              number: 80
-        path: /argocd(/|$)(.*)
-        pathType: ImplementationSpecific
-  tls:
-  - hosts:
-    - cnoe.localtest.me
-    secretName: argocd-net-tls
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: backstage
-  namespace: backstage
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: backstage
-            port:
-              name: http
-        path: /
-        pathType: Prefix
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: backstage
-            port:
-              name: http
-        path: /
-        pathType: Prefix
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: fibonacci-service
-  namespace: fibonacci-app
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: fibonacci-service
-            port:
-              number: 9090
-        path: /fibonacci
-        pathType: Prefix
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/proxy-body-size: 512m
-  name: forgejo
-  namespace: gitea
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: gitea.cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: forgejo-http
-            port:
-              number: 3000
-        path: /
-        pathType: Prefix
-  tls:
-  - hosts:
-    - gitea.cnoe.localtest.me
-    secretName: forgejo-net-tls
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: keycloak-ingress-localhost
-  namespace: keycloak
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: localhost
-    http:
-      paths:
-      - backend:
-          service:
-            name: keycloak
-            port:
-              name: http
-        path: /keycloak
-        pathType: ImplementationSpecific
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: keycloak
-            port:
-              name: http
-        path: /keycloak
-        pathType: ImplementationSpecific
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: minio-console
-  namespace: minio-backup
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: minio-backup.cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: minio-console
-            port:
-              number: 9001
-        path: /
-        pathType: Prefix
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: kube-prometheus-stack-grafana
-  namespace: monitoring
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: kube-prometheus-stack-grafana
-            port:
-              number: 80
-        path: /grafana
-        pathType: Prefix
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: openbao
-  namespace: openbao
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: openbao.cnoe.localtest.me
-    http:
-      paths:
-      - backend:
-          service:
-            name: openbao
-            port:
-              number: 8200
-        path: /
-        pathType: Prefix
diff --git a/template/stacks/core/ingress-apps/minio-console.yaml b/template/stacks/core/ingress-apps/minio-console.yaml
new file mode 100644
index 0000000..ffa909d
--- /dev/null
+++ b/template/stacks/core/ingress-apps/minio-console.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: minio-console
+  namespace: minio-backup
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: minio-backup.cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: minio-console
+            port:
+              number: 9001
+        path: /
+        pathType: Prefix
diff --git a/template/stacks/core/ingress-apps/openbao.yaml b/template/stacks/core/ingress-apps/openbao.yaml
new file mode 100644
index 0000000..bb00b92
--- /dev/null
+++ b/template/stacks/core/ingress-apps/openbao.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: openbao
+  namespace: openbao
+spec:
+  ingressClassName: nginx
+  rules:
+  - host: openbao.cnoe.localtest.me
+    http:
+      paths:
+      - backend:
+          service:
+            name: openbao
+            port:
+              number: 8200
+        path: /
+        pathType: Prefix