diff --git a/argocd/applications/configs/orchestrator-prometheus-agent.yaml b/argocd/applications/configs/orchestrator-prometheus-agent.yaml
deleted file mode 100644
index 5c0d51d68..000000000
--- a/argocd/applications/configs/orchestrator-prometheus-agent.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-containerSecurityContext:
-  allowPrivilegeEscalation: false
-crds:
-  enabled: false
-prometheusOperator:
-  enabled: true
-  admissionWebhooks:
-    enabled: false
-  tls:
-    enabled: false
-  alertmanagerInstanceNamespaces: ["orch-platform"]
-  alertmanagerConfigNamespaces: ["orch-platform"]
-  prometheusInstanceNamespaces: ["orch-platform"]
-kubeletService:
-  enabled: false
-nodeExporter:
-  enabled: false
-prometheus-node-exporter:
-  prometheus:
-    monitor:
-      enabled: false
-kubeStateMetrics:
-  enabled: true
-kube-state-metrics:
-  prometheus:
-    monitor:
-      enabled: true
-grafana:
-  enabled: false
-kubeProxy:
-  enabled: false
-kubeScheduler:
-  enabled: false
-kubeEtcd:
-  enabled: false
-coreDns:
-  enabled: false
-kubeControllerManager:
-  enabled: false
-kubelet:
-  enabled: false
-kubeApiServer:
-  enabled: false
-kubernetesServiceMonitors:
-  enabled: false
-alertmanager:
-  enabled: false
-defaultRules:
-  create: false
-prometheus:
-  agentMode: false
-  enabled: true
-  prometheusSpec:
-    ruleNamespaceSelector:
-      matchLabels:
-        kubernetes.io/metadata.name: 'orch-platform'
-    podMetadata:
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: '15090'
-    ruleSelectorNilUsesHelmValues: false
-    serviceMonitorSelectorNilUsesHelmValues: false
-    podMonitorSelectorNilUsesHelmValues: false
-    probeSelectorNilUsesHelmValues: false
-    retention: 24h
-    scrapeInterval: "60s"
-    evaluationInterval: "60s"
-    remoteWrite:
-      - name: orchestrator-admin
-        url: "http://orchestrator-observability-mimir-gateway:8181/api/v1/push"
-        headers:
-          "X-Scope-OrgID": 'orchestrator-system'
diff --git a/argocd/applications/templates/orchestrator-observability.yaml b/argocd/applications/templates/orchestrator-observability.yaml
index 363aadda9..71b57df9a 100644
--- a/argocd/applications/templates/orchestrator-observability.yaml
+++ b/argocd/applications/templates/orchestrator-observability.yaml
@@ -19,9 +19,9 @@ metadata:
 spec:
   project: {{ required "A valid projectName entry required!" .Values.argo.project }}
   sources:
-    - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
-      chart: o11y/charts/{{$appName}}
-      targetRevision: 0.5.1
+    - repoURL: https://github.com/open-edge-platform/o11y-charts
+      path: charts/orchestrator-observability/deployments/orchestrator-observability
+      targetRevision: target-allocator
       helm:
         releaseName: {{$appName}}
         valuesObject:
diff --git a/argocd/applications/templates/orchestrator-prometheus-agent.yaml b/argocd/applications/templates/orchestrator-prometheus-agent.yaml
deleted file mode 100644
index 43b0400c4..000000000
--- a/argocd/applications/templates/orchestrator-prometheus-agent.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- $appName        := "orchestrator-prometheus-agent" }}
-{{- $namespace      := "orch-platform" }}
-{{- $syncWave       := "1000" }}
----
-{{- if (index .Values.argo.enabled $appName) }}
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "{{ $syncWave }}"
-  name: {{$appName}}
-  namespace: {{ required "A valid namespace entry required!" .Values.argo.namespace }}
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: {{ required "A valid projectName entry required!" .Values.argo.project }}
-  sources:
-    - repoURL: https://prometheus-community.github.io/helm-charts
-      chart: kube-prometheus-stack
-      targetRevision: 69.3.2
-      helm:
-        releaseName: {{$appName}}
-        valuesObject:
-          {{- $customFile := printf "custom/%s.tpl" $appName }}
-          {{- $customConfig := tpl (.Files.Get $customFile) . | fromYaml }}
-          {{- $baseFile := printf "configs/%s.yaml" $appName }}
-          {{- $baseConfig := .Files.Get $baseFile|fromYaml}}
-          {{- $overwrite := (get .Values.postCustomTemplateOverwrite $appName ) | default dict }}
-          {{- mergeOverwrite $baseConfig $customConfig $overwrite | toYaml | nindent 10 }}
-  destination:
-    namespace: {{$namespace}}
-    server: {{ required "A valid targetServer entry required!" .Values.argo.targetServer }}
-  syncPolicy:
-    {{- if .Values.argo.autosync }}
-    automated:
-      prune: true
-      selfHeal: true
-    retry:
-      limit: 5
-      backoff:
-        duration: 5s
-        maxDuration: 3m0s
-        factor: 2
-    {{- end }}
-    syncOptions:
-      - CreateNamespace=true
-      - ApplyOutOfSyncOnly=true
-{{- end }}
diff --git a/orch-configs/profiles/enable-o11y.yaml b/orch-configs/profiles/enable-o11y.yaml
index bf6d764ae..39b22e873 100644
--- a/orch-configs/profiles/enable-o11y.yaml
+++ b/orch-configs/profiles/enable-o11y.yaml
@@ -12,4 +12,3 @@ argo:
     edgenode-observability: true
     orchestrator-dashboards: true
     orchestrator-observability: true
-    orchestrator-prometheus-agent: true