diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/argocd/manifests/argocd-server-ingress.yaml
similarity index 100%
rename from template/stacks/core/ingress-apps/argocd-server.yaml
rename to template/stacks/core/argocd/manifests/argocd-server-ingress.yaml
diff --git a/template/stacks/core/ingress-apps.yaml b/template/stacks/core/ingress-apps.yaml
deleted file mode 100644
index bc33556..0000000
--- a/template/stacks/core/ingress-apps.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ingress-apps
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    server: "https://kubernetes.default.svc"
-  source:
-    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
-    targetRevision: HEAD
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/core/ingress-apps"
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-    retry:
-      limit: -1
diff --git a/template/stacks/forgejo/forgejo.yaml b/template/stacks/forgejo/forgejo-server.yaml
similarity index 77%
rename from template/stacks/forgejo/forgejo.yaml
rename to template/stacks/forgejo/forgejo-server.yaml
index 9957f55..bbca0aa 100644
--- a/template/stacks/forgejo/forgejo.yaml
+++ b/template/stacks/forgejo/forgejo-server.yaml
@@ -27,3 +27,6 @@ spec:
     - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
+      targetRevision: HEAD
+      path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/forgejo-server/manifests"
\ No newline at end of file
diff --git a/template/stacks/forgejo/ingress-apps/forgejo.yaml b/template/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml
similarity index 100%
rename from template/stacks/forgejo/ingress-apps/forgejo.yaml
rename to template/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml
diff --git a/template/stacks/forgejo/ingress-apps.yaml b/template/stacks/forgejo/ingress-apps.yaml
deleted file mode 100644
index 5129526..0000000
--- a/template/stacks/forgejo/ingress-apps.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ingress-apps
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    server: "https://kubernetes.default.svc"
-  source:
-    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
-    targetRevision: HEAD
-    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo/ingress-apps"
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-    retry:
-      limit: -1