diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index 4de4004..96eabd8 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -1,13 +1,3 @@
-# This is only used for deploying older versions of infra-catalogue where the bucket name is not an output of the terragrunt modules
-{{{- define "BUCKET_NAME" -}}}
-{{{- if (getenv "FORGEJO_BUCKET_NAME") -}}}
-{{{ getenv "FORGEJO_BUCKET_NAME" }}}
-{{{- else -}}}
-edp-forgejo-{{{ getenv "CLUSTER_ENVIRONMENT" }}}
-{{{- end -}}}
-{{{- end -}}}
-
-
 
 # We use recreate to make sure only one instance with one version is running, because Forgejo might break or data gets inconsistant.
 strategy:
@@ -134,7 +124,7 @@ gitea:
       MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
       STORAGE_TYPE: minio
       MINIO_LOCATION: eu-de
-      MINIO_BUCKET: "{{{ template "BUCKET_NAME" }}}"
+      MINIO_BUCKET: "{{{ getenv "FORGEJO_BUCKET_NAME" }}}"
       MINIO_USE_SSL: true
 
     queue:
@@ -187,17 +177,4 @@ image:
   # rootless: true
   fullOverride: {{{ getenv "CLIENT_REPO_DOMAIN" }}}/devfw-cicd/edp-forgejo:{{{ .Env.FORGEJO_IMAGE_TAG }}}
 
-forgejo:
-  # This appears to be governed by forgejo-runner, as intuition would suggest
-  # runner:
-  #   enabled: true
-  #   image:
-  #     tag: latest
-  #   # replicas: 3
-  #   config:
-  #     runner:
-  #       labels:
-  #         - docker:docker://node:16-bullseye
-  #         - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-  #         - ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-22.04
-  #         - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04
+forgejo: {}
\ No newline at end of file
diff --git a/template/stacks/garm/garm.yaml b/template/stacks/garm/garm.yaml
index d36ff9b..718ffa5 100644
--- a/template/stacks/garm/garm.yaml
+++ b/template/stacks/garm/garm.yaml
@@ -20,7 +20,7 @@ spec:
   sources:
     - repoURL: https://edp.buildth.ing/DevFW-CICD/garm-helm
       path: charts/garm
-      targetRevision: v0.0.6
+      targetRevision: v0.0.7
       helm:
         valueFiles:
           - $values/{{{ .Env.CLIENT_REPO_ID }}}/{{{ .Env.DOMAIN }}}/stacks/garm/garm/values.yaml
diff --git a/template/stacks/observability/victoria-k8s-stack/values.yaml b/template/stacks/observability/victoria-k8s-stack/values.yaml
index dd1996b..75d5467 100644
--- a/template/stacks/observability/victoria-k8s-stack/values.yaml
+++ b/template/stacks/observability/victoria-k8s-stack/values.yaml
@@ -351,7 +351,7 @@ vmcluster:
           spec:
             resources:
               requests:
-                storage: 10Gi     
+                storage: 10Gi
       resources:
         {}
         # limits:
@@ -543,7 +543,7 @@ alertmanager:
   config:
     route:
       receiver: "blackhole"
-      routes: 
+      routes:
         - matchers:
             - severity=~"critical|major"
           receiver: outlook
@@ -553,7 +553,7 @@ alertmanager:
         email_configs:
           - smarthost: 'mail.mms-support.de:465'
             auth_username: 'ipcei-cis-devfw@mms-support.de'
-            auth_password: 
+            auth_password:
               name: email-user-credentials
               key: connection-string
             from: '"IPCEI CIS DevFW" <ipcei-cis-devfw@mms-support.de>'
@@ -792,7 +792,7 @@ defaultDatasources:
           implementation: prometheus
   # -- Configure additional grafana datasources (passed through tpl).
   # Check [here](http://docs.grafana.org/administration/provisioning/#datasources) for details
-  extra: 
+  extra:
     - name: VictoriaLogs
       access: proxy
       type: victoriametrics-logs-datasource
@@ -843,7 +843,7 @@ grafana:
 
   # Uncomment the block below, if you want to enable VictoriaMetrics Datasource in Grafana:
   # Note that Grafana will need internet access to install the datasource plugin.
-  
+
   plugins:
     - victoriametrics-metrics-datasource
     - victoriametrics-logs-datasource