diff --git a/components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml b/components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml
index 6ead356f239..0924c8ca3b0 100644
--- a/components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml
+++ b/components/monitoring/grafana/base/dashboards/pipeline-service/kustomization.yaml
@@ -2,4 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/openshift-pipelines/pipeline-service/operator/gitops/argocd/grafana/?ref=3b07d3edb07237a26e60b5c9ea7d90cd358f2a2e
+  - https://github.com/openshift-pipelines/pipeline-service/operator/gitops/argocd/grafana/?ref=e52f83e174efb8f308f6e32d1e0fc9f8eb9ed893
diff --git a/components/pipeline-service/development/bump-results-watcher-replicas.yaml b/components/pipeline-service/development/bump-results-watcher-replicas.yaml
index dd1942ff27e..bcd64c5fb6d 100644
--- a/components/pipeline-service/development/bump-results-watcher-replicas.yaml
+++ b/components/pipeline-service/development/bump-results-watcher-replicas.yaml
@@ -1,4 +1,4 @@
 - op: replace
   path: /spec/replicas
   # default pipeline-service setting is 1
-  value: 1
\ No newline at end of file
+  value: 2
\ No newline at end of file
diff --git a/components/pipeline-service/development/config.env b/components/pipeline-service/development/config.env
deleted file mode 100644
index f1cd6b504d8..00000000000
--- a/components/pipeline-service/development/config.env
+++ /dev/null
@@ -1,33 +0,0 @@
-DB_USER=
-DB_PASSWORD=
-DB_HOST=
-DB_PORT=5432
-DB_NAME=
-DB_SSLMODE=disable
-DB_SSLROOTCERT=
-DB_ENABLE_AUTO_MIGRATION=true
-SERVER_PORT=8080
-PROMETHEUS_PORT=9090
-PROMETHEUS_HISTOGRAM=true
-TLS_PATH=/etc/tls
-AUTH_DISABLE=false
-AUTH_IMPERSONATE=true
-LOG_LEVEL=info
-LOGS_API=false
-LOGS_TYPE=File
-LOGS_BUFFER_SIZE=5242880
-LOGS_PATH=/logs
-S3_BUCKET_NAME=
-S3_ENDPOINT=
-S3_HOSTNAME_IMMUTABLE=false
-S3_REGION=
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_MULTI_PART_SIZE=5242880
-GCS_BUCKET_NAME=
-STORAGE_EMULATOR_HOST=
-K8S_QPS=50
-K8S_BURST=100
-GRPC_WORKER_POOL=50
-PROFILING=true
-PROFILING_PORT=6060
\ No newline at end of file
diff --git a/components/pipeline-service/development/kustomization.yaml b/components/pipeline-service/development/kustomization.yaml
index 31a76b165cd..4c6f63268f0 100644
--- a/components/pipeline-service/development/kustomization.yaml
+++ b/components/pipeline-service/development/kustomization.yaml
@@ -8,23 +8,10 @@ commonAnnotations:
   argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 
 resources:
-  - https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service?ref=3b07d3edb07237a26e60b5c9ea7d90cd358f2a2e
-  - https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service-storage?ref=3b07d3edb07237a26e60b5c9ea7d90cd358f2a2e
+  - https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service?ref=e52f83e174efb8f308f6e32d1e0fc9f8eb9ed893
+  - https://github.com/openshift-pipelines/pipeline-service.git/developer/openshift/gitops/argocd/pipeline-service-storage?ref=e52f83e174efb8f308f6e32d1e0fc9f8eb9ed893
   - ../base/rbac
 
-# generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
-configMapGenerator:
-  - behavior: replace
-    files:
-      - config.env
-    name: api-config
-    options:
-      disableNameSuffixHash: true
-  - behavior: merge
-    name: config-observability
-    literals:
-      - profiling.enable="true"
-
 patches:
   - path: chains-tekton-config-patches.yaml
     target:
@@ -59,8 +46,3 @@ patches:
       kind: Deployment
       namespace: tekton-results
       name: tekton-results-watcher
-  - path: update-results-watcher-performance.yaml
-    target:
-      kind: Deployment
-      namespace: tekton-results
-      name: tekton-results-watcher
\ No newline at end of file
diff --git a/components/pipeline-service/development/update-results-watcher-performance.yaml b/components/pipeline-service/development/update-results-watcher-performance.yaml
deleted file mode 100644
index 0490852b577..00000000000
--- a/components/pipeline-service/development/update-results-watcher-performance.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: -threadiness
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "50"
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: -qps
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "50"
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: -burst
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "100"
\ No newline at end of file
diff --git a/components/pipeline-service/staging/base/bump-results-watcher-replicas.yaml b/components/pipeline-service/staging/base/bump-results-watcher-replicas.yaml
index dd1942ff27e..bcd64c5fb6d 100644
--- a/components/pipeline-service/staging/base/bump-results-watcher-replicas.yaml
+++ b/components/pipeline-service/staging/base/bump-results-watcher-replicas.yaml
@@ -1,4 +1,4 @@
 - op: replace
   path: /spec/replicas
   # default pipeline-service setting is 1
-  value: 1
\ No newline at end of file
+  value: 2
\ No newline at end of file
diff --git a/components/pipeline-service/staging/base/config.env b/components/pipeline-service/staging/base/config.env
deleted file mode 100644
index f1cd6b504d8..00000000000
--- a/components/pipeline-service/staging/base/config.env
+++ /dev/null
@@ -1,33 +0,0 @@
-DB_USER=
-DB_PASSWORD=
-DB_HOST=
-DB_PORT=5432
-DB_NAME=
-DB_SSLMODE=disable
-DB_SSLROOTCERT=
-DB_ENABLE_AUTO_MIGRATION=true
-SERVER_PORT=8080
-PROMETHEUS_PORT=9090
-PROMETHEUS_HISTOGRAM=true
-TLS_PATH=/etc/tls
-AUTH_DISABLE=false
-AUTH_IMPERSONATE=true
-LOG_LEVEL=info
-LOGS_API=false
-LOGS_TYPE=File
-LOGS_BUFFER_SIZE=5242880
-LOGS_PATH=/logs
-S3_BUCKET_NAME=
-S3_ENDPOINT=
-S3_HOSTNAME_IMMUTABLE=false
-S3_REGION=
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_MULTI_PART_SIZE=5242880
-GCS_BUCKET_NAME=
-STORAGE_EMULATOR_HOST=
-K8S_QPS=50
-K8S_BURST=100
-GRPC_WORKER_POOL=50
-PROFILING=true
-PROFILING_PORT=6060
\ No newline at end of file
diff --git a/components/pipeline-service/staging/base/kustomization.yaml b/components/pipeline-service/staging/base/kustomization.yaml
index 257538a6120..dcbbf3bcd2b 100644
--- a/components/pipeline-service/staging/base/kustomization.yaml
+++ b/components/pipeline-service/staging/base/kustomization.yaml
@@ -8,25 +8,12 @@ commonAnnotations:
   argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 
 resources:
-  - https://github.com/openshift-pipelines/pipeline-service.git/operator/gitops/argocd/pipeline-service?ref=3b07d3edb07237a26e60b5c9ea7d90cd358f2a2e
+  - https://github.com/openshift-pipelines/pipeline-service.git/operator/gitops/argocd/pipeline-service?ref=e52f83e174efb8f308f6e32d1e0fc9f8eb9ed893
   - pipelines-as-code-secret.yaml
   - ../../base/external-secrets
   - ../../base/testing
   - ../../base/rbac
 
-# generate a new configmap with updated values (logs api, db ssl mode) and replace the default one
-configMapGenerator:
-  - behavior: replace
-    files:
-      - config.env
-    name: api-config
-    options:
-      disableNameSuffixHash: true
-  - behavior: merge
-    name: config-observability
-    literals:
-      - profiling.enable="true"
-
 patches:
   - path: chains-tekton-config-patches.yaml
     target:
@@ -46,10 +33,20 @@ patches:
     target:
       kind: TektonConfig
       name: config
+#  - path: scale-down-exporter.yaml
+#    target:
+#      kind: Deployment
+#      name: pipeline-metrics-exporter
+#      namespace: openshift-pipelines
   - path: update-tekton-config-performance.yaml
     target:
       kind: TektonConfig
       name: config
+  - path: bump-results-watcher-replicas.yaml
+    target:
+      kind: Deployment
+      namespace: tekton-results
+      name: tekton-results-watcher
   - path: update-results-watcher-performance.yaml
     target:
       kind: Deployment
diff --git a/components/pipeline-service/staging/base/update-results-watcher-performance.yaml b/components/pipeline-service/staging/base/update-results-watcher-performance.yaml
index 590946b66e8..ec2b073856e 100644
--- a/components/pipeline-service/staging/base/update-results-watcher-performance.yaml
+++ b/components/pipeline-service/staging/base/update-results-watcher-performance.yaml
@@ -4,22 +4,4 @@
   value: "250m"
 - op: replace
   path: /spec/template/spec/containers/1/resources/limits/cpu
-  value: "250m"
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: -threadiness
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: "50"
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: -qps
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: "50"
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: -burst
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: "100"
\ No newline at end of file
+  value: "250m"
\ No newline at end of file
diff --git a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
index e159c3d49cd..3c8b702fcc7 100644
--- a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
@@ -897,7 +897,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  config.env: |-
+  config.env: |
     DB_USER=
     DB_PASSWORD=
     DB_HOST=
@@ -926,11 +926,6 @@ data:
     S3_MULTI_PART_SIZE=5242880
     GCS_BUCKET_NAME=
     STORAGE_EMULATOR_HOST=
-    K8S_QPS=50
-    K8S_BURST=100
-    GRPC_WORKER_POOL=50
-    PROFILING=true
-    PROFILING_PORT=6060
 kind: ConfigMap
 metadata:
   annotations:
@@ -1059,7 +1054,6 @@ data:
     metrics.taskrun.duration-type: "histogram"
     metrics.pipelinerun.level: "pipeline"
     metrics.pipelinerun.duration-type: "histogram"
-  profiling.enable: "true"
 kind: ConfigMap
 metadata:
   annotations:
@@ -1163,10 +1157,6 @@ spec:
     port: 9443
     protocol: TCP
     targetPort: metrics
-  - name: profiling
-    port: 6060
-    protocol: TCP
-    targetPort: 6060
   selector:
     app.kubernetes.io/name: tekton-results-api
 ---
@@ -1339,7 +1329,7 @@ spec:
             secretKeyRef:
               key: db.name
               name: tekton-results-database
-        image: quay.io/redhat-appstudio/tekton-results-api:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-api:bae7851ff584423503af324200f52cd28ca99116
         livenessProbe:
           httpGet:
             path: /healthz
@@ -1408,7 +1398,7 @@ metadata:
   name: tekton-results-watcher
   namespace: tekton-results
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/name: tekton-results-watcher
@@ -1474,12 +1464,6 @@ spec:
         - -check_owner=false
         - -completed_run_grace_period
         - 10m
-        - -threadiness
-        - "50"
-        - -qps
-        - "50"
-        - -burst
-        - "100"
         env:
         - name: SYSTEM_NAMESPACE
           valueFrom:
@@ -1497,7 +1481,7 @@ spec:
           value: tekton-results-api-service.tekton-pipelines.svc.cluster.local:8080
         - name: AUTH_MODE
           value: token
-        image: quay.io/redhat-appstudio/tekton-results-watcher:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-watcher:bae7851ff584423503af324200f52cd28ca99116
         name: watcher
         ports:
         - containerPort: 9090
diff --git a/components/pipeline-service/staging/stone-stg-m01/deploy.yaml b/components/pipeline-service/staging/stone-stg-m01/deploy.yaml
index f575a17438b..40a9f3257ca 100644
--- a/components/pipeline-service/staging/stone-stg-m01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stg-m01/deploy.yaml
@@ -897,7 +897,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  config.env: |-
+  config.env: |
     DB_USER=
     DB_PASSWORD=
     DB_HOST=
@@ -926,11 +926,6 @@ data:
     S3_MULTI_PART_SIZE=5242880
     GCS_BUCKET_NAME=
     STORAGE_EMULATOR_HOST=
-    K8S_QPS=50
-    K8S_BURST=100
-    GRPC_WORKER_POOL=50
-    PROFILING=true
-    PROFILING_PORT=6060
 kind: ConfigMap
 metadata:
   annotations:
@@ -1059,7 +1054,6 @@ data:
     metrics.taskrun.duration-type: "histogram"
     metrics.pipelinerun.level: "pipeline"
     metrics.pipelinerun.duration-type: "histogram"
-  profiling.enable: "true"
 kind: ConfigMap
 metadata:
   annotations:
@@ -1163,10 +1157,6 @@ spec:
     port: 9443
     protocol: TCP
     targetPort: metrics
-  - name: profiling
-    port: 6060
-    protocol: TCP
-    targetPort: 6060
   selector:
     app.kubernetes.io/name: tekton-results-api
 ---
@@ -1339,7 +1329,7 @@ spec:
             secretKeyRef:
               key: db.name
               name: tekton-results-database
-        image: quay.io/redhat-appstudio/tekton-results-api:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-api:bae7851ff584423503af324200f52cd28ca99116
         livenessProbe:
           httpGet:
             path: /healthz
@@ -1408,7 +1398,7 @@ metadata:
   name: tekton-results-watcher
   namespace: tekton-results
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/name: tekton-results-watcher
@@ -1474,12 +1464,6 @@ spec:
         - -check_owner=false
         - -completed_run_grace_period
         - 10m
-        - -threadiness
-        - "50"
-        - -qps
-        - "50"
-        - -burst
-        - "100"
         env:
         - name: SYSTEM_NAMESPACE
           valueFrom:
@@ -1497,7 +1481,7 @@ spec:
           value: tekton-results-api-service.tekton-pipelines.svc.cluster.local:8080
         - name: AUTH_MODE
           value: token
-        image: quay.io/redhat-appstudio/tekton-results-watcher:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-watcher:bae7851ff584423503af324200f52cd28ca99116
         name: watcher
         ports:
         - containerPort: 9090
diff --git a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
index 53f35ba09ab..79c2231578a 100644
--- a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
@@ -897,7 +897,7 @@ subjects:
 ---
 apiVersion: v1
 data:
-  config.env: |-
+  config.env: |
     DB_USER=
     DB_PASSWORD=
     DB_HOST=
@@ -926,11 +926,6 @@ data:
     S3_MULTI_PART_SIZE=5242880
     GCS_BUCKET_NAME=
     STORAGE_EMULATOR_HOST=
-    K8S_QPS=50
-    K8S_BURST=100
-    GRPC_WORKER_POOL=50
-    PROFILING=true
-    PROFILING_PORT=6060
 kind: ConfigMap
 metadata:
   annotations:
@@ -1059,7 +1054,6 @@ data:
     metrics.taskrun.duration-type: "histogram"
     metrics.pipelinerun.level: "pipeline"
     metrics.pipelinerun.duration-type: "histogram"
-  profiling.enable: "true"
 kind: ConfigMap
 metadata:
   annotations:
@@ -1163,10 +1157,6 @@ spec:
     port: 9443
     protocol: TCP
     targetPort: metrics
-  - name: profiling
-    port: 6060
-    protocol: TCP
-    targetPort: 6060
   selector:
     app.kubernetes.io/name: tekton-results-api
 ---
@@ -1339,7 +1329,7 @@ spec:
             secretKeyRef:
               key: db.name
               name: tekton-results-database
-        image: quay.io/redhat-appstudio/tekton-results-api:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-api:bae7851ff584423503af324200f52cd28ca99116
         livenessProbe:
           httpGet:
             path: /healthz
@@ -1408,7 +1398,7 @@ metadata:
   name: tekton-results-watcher
   namespace: tekton-results
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/name: tekton-results-watcher
@@ -1474,12 +1464,6 @@ spec:
         - -check_owner=false
         - -completed_run_grace_period
         - 10m
-        - -threadiness
-        - "50"
-        - -qps
-        - "50"
-        - -burst
-        - "100"
         env:
         - name: SYSTEM_NAMESPACE
           valueFrom:
@@ -1497,7 +1481,7 @@ spec:
           value: tekton-results-api-service.tekton-pipelines.svc.cluster.local:8080
         - name: AUTH_MODE
           value: token
-        image: quay.io/redhat-appstudio/tekton-results-watcher:dc54f48f6a1adfde07b923129db33aaa77a61213
+        image: quay.io/redhat-appstudio/tekton-results-watcher:bae7851ff584423503af324200f52cd28ca99116
         name: watcher
         ports:
         - containerPort: 9090