diff --git a/template/stacks/core/argocd/values.yaml b/template/stacks/core/argocd/values.yaml
index 29770a0..3fb3ddf 100644
--- a/template/stacks/core/argocd/values.yaml
+++ b/template/stacks/core/argocd/values.yaml
@@ -4,6 +4,7 @@ global:
 configs:
   params:
     server.insecure: true
+    server.basehref: /argocd
   cm:
     application.resourceTrackingMethod: annotation
     timeout.reconciliation: 60s
diff --git a/template/stacks/core/ingress-apps/argocd-server.yaml b/template/stacks/core/ingress-apps/argocd-server.yaml
index a4860b2..0446b6c 100644
--- a/template/stacks/core/ingress-apps/argocd-server.yaml
+++ b/template/stacks/core/ingress-apps/argocd-server.yaml
@@ -4,6 +4,8 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    nginx.ingress.kubernetes.io/use-regex: "true"
 {{{ if eq .Env.CLUSTER_TYPE "osc" }}}
     dns.gardener.cloud/class: garden
     dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}}
@@ -14,7 +16,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: {{{ .Env.DOMAIN_ARGOCD }}}
+  - host: {{{ .Env.DOMAIN }}}
     http:
       paths:
       - backend:
@@ -22,9 +24,9 @@ spec:
             name: argocd-server
             port:
               number: 80
-        path: /
-        pathType: Prefix
+        path: /argocd(/|$)(.*)
+        pathType: ImplementationSpecific
   tls:
   - hosts:
-    - {{{ .Env.DOMAIN_ARGOCD }}}
+    - {{{ .Env.DOMAIN }}}
     secretName: argocd-net-tls
diff --git a/template/stacks/monitoring/alloy.yaml b/template/stacks/monitoring/alloy.yaml
new file mode 100644
index 0000000..7d4d614
--- /dev/null
+++ b/template/stacks/monitoring/alloy.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: alloy
+  namespace: argocd
+  labels:
+    env: dev
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+  destination:
+    name: in-cluster
+    namespace: monitoring
+  sources:
+    - repoURL: https://github.com/grafana/alloy.git
+      path: operations/helm/charts/alloy   
+      targetRevision: HEAD      
+      helm:
+        valueFiles:
+          - $values/stacks/monitoring/alloy/values.yaml
+    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+      targetRevision: HEAD
+      ref: values
\ No newline at end of file
diff --git a/template/stacks/monitoring/alloy/values.yaml b/template/stacks/monitoring/alloy/values.yaml
new file mode 100644
index 0000000..3f038fa
--- /dev/null
+++ b/template/stacks/monitoring/alloy/values.yaml
@@ -0,0 +1,4 @@
+alloy:
+  create: false
+  name: alloy-config
+  key: config.alloy
diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml
index dda3ad0..b3bfd57 100644
--- a/template/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml
@@ -182,7 +182,7 @@ data:
         - type: 'config'
           instances:
             - name: in-cluster
-              url: https://{{{ .Env.DOMAIN_ARGOCD }}}:443
+              url: https://{{{ .Env.DOMAIN }}}:443/argocd
               username: admin
               password: ${ARGOCD_ADMIN_PASSWORD}
     argoWorkflows: