diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/openshift-operator.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/openshift-operator.yaml
index 64b575f74..88e91f430 100644
--- a/operator/gitops/argocd/pipeline-service/openshift-pipelines/openshift-operator.yaml
+++ b/operator/gitops/argocd/pipeline-service/openshift-pipelines/openshift-operator.yaml
@@ -7,7 +7,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "0"
 spec:
-  channel: latest
+  channel: pipelines-5.0
   name: openshift-pipelines-operator-rh
   source: custom-operators
   sourceNamespace: openshift-marketplace
diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/osp-nightly-catalog-source.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/osp-nightly-catalog-source.yaml
index da0b6d1e8..c846e63aa 100644
--- a/operator/gitops/argocd/pipeline-service/openshift-pipelines/osp-nightly-catalog-source.yaml
+++ b/operator/gitops/argocd/pipeline-service/openshift-pipelines/osp-nightly-catalog-source.yaml
@@ -8,7 +8,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "0"
 spec:
   sourceType: grpc
-  image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-operator-bundle-container-index@sha256:99d1e1ba1c24d950db7147e26041193304247ed92e88788023b58eb787282a9a
+  image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-operator-bundle-container-index@sha256:7444d41ebe811a505866a99a92e24ca390677835dfdd597bed2e0b5d66780c5b
   displayName: custom-operators
   updateStrategy:
     registryPoll:
diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml
index 447bf4c3c..832bd540d 100644
--- a/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml
+++ b/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml
@@ -83,7 +83,6 @@ spec:
     enable-cluster-resolver: true
     enable-git-resolver: true
     enable-hub-resolver: true
-    enable-tekton-oci-bundles: true
     enable-step-actions: true
     options:
       disabled: false
diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
index 809c01b5c..2763ccd4a 100644
--- a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
+++ b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: tekton-results
 resources:
-  - https://github.com/openshift-pipelines/tektoncd-results.git/config/overlays/base-only/?ref=e35af9274c0df84386b73aae8df0ad496ad175df
+  - https://github.com/openshift-pipelines/tektoncd-results.git/config/overlays/base-only/?ref=b4017a355cafd589c3ae9a31f3d869e21a4b77fe
   - namespace.yaml
   - api-route.yaml
   - watcher-logging-rbac.yaml
@@ -13,10 +13,13 @@ resources:
 images:
   - name: ko://github.com/tektoncd/results/cmd/api
     newName: quay.io/konflux-ci/tekton-results-api
-    newTag: e35af9274c0df84386b73aae8df0ad496ad175df
+    newTag: b4017a355cafd589c3ae9a31f3d869e21a4b77fe
   - name: ko://github.com/tektoncd/results/cmd/watcher
     newName: quay.io/konflux-ci/tekton-results-watcher
-    newTag: e35af9274c0df84386b73aae8df0ad496ad175df
+    newTag: b4017a355cafd589c3ae9a31f3d869e21a4b77fe
+  - name: ko://github.com/tektoncd/results/cmd/retention-policy-agent
+    newName: quay.io/konflux-ci/tekton-results-retention-policy-agent
+    newTag: b4017a355cafd589c3ae9a31f3d869e21a4b77fe
 
 # generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
 configMapGenerator:
@@ -51,3 +54,9 @@ patches:
       kind: Service
       name: tekton-results-api-service
       labelSelector: "app.kubernetes.io/name=tekton-results-api"
+  - path: retention-policy-agent-deployment.yaml
+    target:
+      kind: Deployment
+      group: apps
+      version: v1
+      name: tekton-results-retention-policy-agent
diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-deployment.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-deployment.yaml
new file mode 100644
index 000000000..1ba738378
--- /dev/null
+++ b/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-deployment.yaml
@@ -0,0 +1,4 @@
+---
+- op: replace
+  path: /spec/replicas
+  value: 0
diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-sync.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-sync.yaml
new file mode 100644
index 000000000..e2e5f0363
--- /dev/null
+++ b/operator/gitops/argocd/pipeline-service/tekton-results/retention-policy-agent-sync.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tekton-results-retention-policy-agent
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml
index fbbc12405..15cb78f90 100644
--- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml
+++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml
@@ -38,6 +38,7 @@ spec:
               "-check_owner=false",
               "-completed_run_grace_period",
               "10m",
+              "-logs_api=true"
             ]
           resources:
             requests: