diff --git a/otc/edp.buildth.ing/stacks/core/argocd.yaml b/otc/edp.buildth.ing/stacks/core/argocd.yaml
index a698feb..cda5a63 100644
--- a/otc/edp.buildth.ing/stacks/core/argocd.yaml
+++ b/otc/edp.buildth.ing/stacks/core/argocd.yaml
@@ -23,7 +23,7 @@ spec:
       # TODO: RIRE Can be updated when https://github.com/argoproj/argo-cd/issues/20790 is fixed and merged
       # As logout make problems, it is suggested to switch from path based routing to an own argocd domain,
       # similar to the CNOE amazon reference implementation and in our case, Forgejo
-      targetRevision: argo-cd-9.1.5
+      targetRevision: argo-cd-9.4.6
       helm:
         valueFiles:
           - $values/otc/edp.buildth.ing/stacks/core/argocd/values.yaml
diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server.yaml
index d835ede..5b9f4a9 100644
--- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server.yaml
+++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server.yaml
@@ -20,7 +20,7 @@ spec:
   sources:
     - repoURL: https://code.forgejo.org/forgejo-helm/forgejo-helm.git
       path: .
-      targetRevision: v12.0.0
+      targetRevision: v16.2.0
       helm:
         valueFiles:
           - $values/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
diff --git a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
index f0cf21a..2ee338c 100644
--- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
+++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
@@ -174,7 +174,7 @@ image:
   #tag: "8.0.3"
   # Adds -rootless suffix to image name
   # rootless: true
-  fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:v11.0.3-edp1
+  fullOverride: observability.buildth.ing/devfw-cicd/edp-forgejo:14.0.2-edp1-rootless
 
 forgejo:
   # This appears to be governed by forgejo-runner, as intuition would suggest
diff --git a/otc/edp.buildth.ing/stacks/garm/garm/values.yaml b/otc/edp.buildth.ing/stacks/garm/garm/values.yaml
index 36f8a0b..e803f5c 100644
--- a/otc/edp.buildth.ing/stacks/garm/garm/values.yaml
+++ b/otc/edp.buildth.ing/stacks/garm/garm/values.yaml
@@ -21,6 +21,8 @@ credentials:
     existingSecretName: "edge-credential"
   gitea:
     url: "https://edp.buildth.ing"  # Required
+  db:
+    existingSecretName: garm-fixed-credentials
 
 providerConfig:
   edgeConnect: