diff --git a/otc/edp.buildth.ing/stacks/core/cloudnative-pg.yaml b/otc/edp.buildth.ing/stacks/core/cloudnative-pg.yaml
index 9cfdcce..70b6ffa 100644
--- a/otc/edp.buildth.ing/stacks/core/cloudnative-pg.yaml
+++ b/otc/edp.buildth.ing/stacks/core/cloudnative-pg.yaml
@@ -12,6 +12,7 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
+      - ServerSideApply=true
     retry:
       limit: -1
   destination:
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 0ae8318..87573f8 100644
--- a/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
+++ b/otc/edp.buildth.ing/stacks/forgejo/forgejo-server/values.yaml
@@ -185,8 +185,7 @@ forgejo:
     config:
       runner:
         labels:
-          - docker:docker://node:24-bullseye
-          - self-hosted:docker://ghcr.io/catthehacker/ubuntu:act-24.04
+          - 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-24.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04
-          - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-24.04
+          - ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-22.04
diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml
new file mode 100644
index 0000000..4fd45cf
--- /dev/null
+++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: optimiser-receiver
+  namespace: argocd
+  labels:
+    env: dev
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: -1
+  destination:
+    name: in-cluster
+    namespace: garm
+  source:
+    repoURL: https://observability.buildth.ing/DevFW-CICD/stacks-instances
+    targetRevision: HEAD
+    path: "otc/edp.buildth.ing/stacks/garm/optimiser-receiver"
diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml
new file mode 100644
index 0000000..f7e366b
--- /dev/null
+++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/deployment.yaml
@@ -0,0 +1,93 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: optimiser-receiver
+  labels:
+    app: optimiser-receiver
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: optimiser-receiver
+  template:
+    metadata:
+      labels:
+        app: optimiser-receiver
+    spec:
+      containers:
+        - name: receiver
+          image: edp.buildth.ing/devfw-cicd/forgejo-runner-optimiser-receiver:0.0.3
+          args:
+            - --db=/data/metrics.db
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          env:
+            - name: RECEIVER_READ_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: optimiser-tokens
+                  key: read-token
+            - name: RECEIVER_HMAC_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: optimiser-tokens
+                  key: hmac-key
+          volumeMounts:
+            - name: data
+              mountPath: /data
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 5
+            periodSeconds: 30
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 2
+            periodSeconds: 10
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: optimiser-receiver-data
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: optimiser-receiver
+  labels:
+    app: optimiser-receiver
+spec:
+  selector:
+    app: optimiser-receiver
+  ports:
+    - name: http
+      port: 8080
+      targetPort: http
+      protocol: TCP
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: optimiser-receiver-data
+  labels:
+    app: optimiser-receiver
+  annotations:
+    everest.io/disk-volume-type: GPSSD
+spec:
+  storageClassName: csi-disk
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml
new file mode 100644
index 0000000..aa6ac34
--- /dev/null
+++ b/otc/edp.buildth.ing/stacks/garm/optimiser-receiver/ingress.yaml
@@ -0,0 +1,26 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    cert-manager.io/cluster-issuer: main
+
+  name: optimiser-receiver
+  namespace: garm
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: optimiser.edp.buildth.ing
+      http:
+        paths:
+          - backend:
+              service:
+                name: optimiser-receiver
+                port:
+                  number: 8080
+            path: /
+            pathType: Prefix
+  tls:
+    - hosts:
+        - optimiser.edp.buildth.ing
+      secretName: optimiser-receiver-tls
diff --git a/otc/edp.buildth.ing/stacks/observability-client/vector/values.yaml b/otc/edp.buildth.ing/stacks/observability-client/vector/values.yaml
index 2fefacd..7b30cdc 100644
--- a/otc/edp.buildth.ing/stacks/observability-client/vector/values.yaml
+++ b/otc/edp.buildth.ing/stacks/observability-client/vector/values.yaml
@@ -48,7 +48,7 @@ customConfig:
       type: elasticsearch
       inputs: [parser]
       endpoints: 
-        - https://o12y.observability.buildth.ing/insert/elasticsearch/
+        - https://o12y.observability./insert/elasticsearch/
       auth:
         strategy: basic
         user: ${VECTOR_USER}
diff --git a/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml b/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml
index 255e9e5..4e1c079 100644
--- a/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml
+++ b/otc/edp.buildth.ing/stacks/observability-client/vm-client-stack/values.yaml
@@ -778,7 +778,7 @@ vmagent:
   # -- Remote write configuration of VMAgent, allowed parameters defined in a [spec](https://docs.victoriametrics.com/operator/api#vmagentremotewritespec)
   additionalRemoteWrites:
     # []
-    - url: https://o12y.observability.buildth.ing/api/v1/write
+    - url: https://o12y.observability./api/v1/write
       basicAuth:
         username:
           name: simple-user-secret
diff --git a/otc/edp.buildth.ing/stacks/observability/victoria-k8s-stack/values.yaml b/otc/edp.buildth.ing/stacks/observability/victoria-k8s-stack/values.yaml
index 440cdad..abd044d 100644
--- a/otc/edp.buildth.ing/stacks/observability/victoria-k8s-stack/values.yaml
+++ b/otc/edp.buildth.ing/stacks/observability/victoria-k8s-stack/values.yaml
@@ -690,9 +690,9 @@ vmauth:
       annotations:
         nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
         cert-manager.io/cluster-issuer: main
-      host: o12y.observability.buildth.ing
+      host: o12y.observability.
       tlsHosts:
-        - o12y.observability.buildth.ing
+        - o12y.observability.
       tlsSecretName: vmauth-tls-secret
     unauthorizedUserAccessSpec: {}
     selectAllByDefault: true