diff --git a/otc/central-forgejo.think-ahead.cloud/registry/forgejo.yaml b/otc/central-forgejo.think-ahead.cloud/registry/forgejo.yaml
index 6137a94..0c69829 100644
--- a/otc/central-forgejo.think-ahead.cloud/registry/forgejo.yaml
+++ b/otc/central-forgejo.think-ahead.cloud/registry/forgejo.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: forgejostack
+  name: forgejo
   namespace: argocd
   labels:
     env: dev
diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-runner.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-runner.yaml
index 61731df..52d65aa 100644
--- a/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-runner.yaml
+++ b/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-runner.yaml
@@ -21,4 +21,4 @@ spec:
   source:
     repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances
     targetRevision: HEAD
-    path: "otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo-runner"
+    path: "otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-runner"
diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-server/values.yaml
similarity index 100%
rename from otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo/values.yaml
rename to otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-server/values.yaml
diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo.yaml
index a483306..fdd1eca 100644
--- a/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo.yaml
+++ b/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: forgejo
+  name: forgejo-server
   namespace: argocd
   labels:
     env: dev
@@ -23,7 +23,7 @@ spec:
       targetRevision: v12.0.0-depends
       helm:
         valueFiles:
-          - $values/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml
+          - $values/otc/central-forgejo.think-ahead.cloud/stacks/forgejo/forgejo-server/values.yaml
     - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances
       targetRevision: HEAD
       ref: values