diff --git a/template/registry/forgejo.yaml b/template/registry/forgejo.yaml
new file mode 100644
index 0000000..75fdcae
--- /dev/null
+++ b/template/registry/forgejo.yaml
@@ -0,0 +1,24 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: forgejo
+  namespace: argocd
+  labels:
+    env: dev
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    name: in-cluster
+    namespace: argocd
+  source:
+    path: "{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/forgejo"
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
+    targetRevision: HEAD
+  project: default
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/template/stacks/core/forgejo-runner.yaml b/template/stacks/forgejo/forgejo-runner.yaml
similarity index 100%
rename from template/stacks/core/forgejo-runner.yaml
rename to template/stacks/forgejo/forgejo-runner.yaml
diff --git a/template/stacks/core/forgejo-runner/dind-docker.yaml b/template/stacks/forgejo/forgejo-runner/dind-docker.yaml
similarity index 100%
rename from template/stacks/core/forgejo-runner/dind-docker.yaml
rename to template/stacks/forgejo/forgejo-runner/dind-docker.yaml
diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/forgejo/forgejo.yaml
similarity index 100%
rename from template/stacks/core/forgejo.yaml
rename to template/stacks/forgejo/forgejo.yaml
diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/forgejo/forgejo/values.yaml
similarity index 100%
rename from template/stacks/core/forgejo/values.yaml
rename to template/stacks/forgejo/forgejo/values.yaml