diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index e9a562c..9b4332c 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -39,10 +39,6 @@ extraVolumes:
       secretName: custom-database-certs
 
 gitea:
-  metrics:
-    enabled: true
-    serviceMonitor:
-      enabled: true
   additionalConfigFromEnvs:
     - name: FORGEJO__storage__MINIO_ACCESS_KEY_ID
       valueFrom:
@@ -89,22 +85,11 @@ gitea:
         secretKeyRef:
           name: postgres-forgejo-cloud-credentials
           key: password
-    # Either 'elasticsearch' or 'bleve' (go in memory search engine)
-    - name: FORGEJO__indexer__ISSUE_INDEXER_TYPE
-      valueFrom:
-        secretKeyRef:
-          name: elasticsearch-cloud-credentials
-          key: type
     - name: FORGEJO__indexer__ISSUE_INDEXER_CONN_STR
       valueFrom:
         secretKeyRef:
           name: elasticsearch-cloud-credentials
           key: connection-string
-    - name: FORGEJO__indexer__ISSUE_INDEXER_ENABLED
-      valueFrom:
-        secretKeyRef:
-          name: elasticsearch-cloud-credentials
-          key: enabled
     - name: FORGEJO__mailer__PASSWD
       valueFrom:
         secretKeyRef:
@@ -117,11 +102,18 @@ gitea:
   config:
     APP_NAME: 'EDP'
     APP_SLOGAN: 'Build your thing in minutes'
+    indexer:
+      ISSUE_INDEXER_ENABLED: true
+      ISSUE_INDEXER_TYPE: elasticsearch
+      # TODO next
+      REPO_INDEXER_ENABLED: false
+      # REPO_INDEXER_TYPE: meilisearch # not yet working
+
     storage:
       MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
       STORAGE_TYPE: minio
       MINIO_LOCATION: eu-de
-      MINIO_BUCKET: {{{ .Env.FORGEJO_BUCKET_NAME }}}
+      MINIO_BUCKET: edp-forgejo-{{{ .Env.CLUSTER_ENVIRONMENT }}}
       MINIO_USE_SSL: true
 
     queue:
@@ -171,7 +163,7 @@ image:
   #tag: "8.0.3"
   # Adds -rootless suffix to image name
   # rootless: true
-  fullOverride: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/edp-forgejo:v1.1.0-edp-v11.0.3
+  fullOverride: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/edp-forgejo:prerelease-v11-0-1-rootless
 
 forgejo:
   runner:
diff --git a/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml b/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml
deleted file mode 100644
index f884bd9..0000000
--- a/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMRule
-metadata:
-  name: forgejo-alerts
-  namespace: observability
-spec:
-  groups:
-    - name: forgejo
-      rules:
-        - alert: forgejo down
-          expr: sum by(cluster_environment) (up{pod=~"forgejo-server-.*"}) < 1
-          for: 30s
-          labels:
-            severity: major
-            job:  "{{ $labels.job }}"
-          annotations:
-            value: "{{ $value }}"
-            description: 'forgejo is down in cluster environment {{ $labels.cluster_environment }}'