diff --git a/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml b/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml
index 3667d72d9ff76..664d1232df7f2 100644
--- a/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml
+++ b/ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml
@@ -23,9 +23,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.16"
 resources:
   '*':
@@ -48,6 +47,9 @@ tests:
   steps:
     cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155560
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157120
       OPERATORS: |
         [
             {"name": "amq-streams", "source": "cs-redhat-operator-index", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
@@ -56,6 +58,9 @@ tests:
         ]
       SELF_MANAGED_ADDITIONAL_CA: "true"
       SELF_MANAGED_REGISTRY_CERT: "true"
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-disconnected-deprovision
     test:
     - ref: distributed-tracing-install-disconnected
     - ref: install-operators
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml
index 7165f323f45c0..fd9162dcff3f1 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml
@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.12"
 resources:
   '*':
@@ -43,9 +42,11 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: gcp-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157117
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -54,12 +55,15 @@ tests:
             {"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
-      SKIP_TESTS: tests/e2e-openshift-object-stores/*
+      SKIP_TESTS: tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml
index 99475c4e51c2e..e49b3025d9f58 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml
@@ -20,22 +20,19 @@ images:
     to: obs-tests-runner
 releases:
   arm64-latest:
-    candidate:
+    release:
       architecture: arm64
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
   latest:
-    candidate:
+    release:
       architecture: amd64
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
   target:
-    candidate:
+    release:
       architecture: multi
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
 resources:
   '*':
@@ -60,8 +57,11 @@ tests:
     dependencies:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       BASE_DOMAIN: observability.azure.devcluster.openshift.com
       COMPUTE_NODE_TYPE: Standard_D4ps_v5
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OCP_ARCH: arm64
       OPERATORS: |
         [
@@ -71,7 +71,10 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e-openshift/monolithic-multitenancy-static
-        tests/e2e-openshift-serverless/* tests/e2e-openshift-object-stores/*
+        tests/e2e-openshift-serverless/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-azure-ipi-deprovision
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -86,6 +89,9 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-stage.yaml
deleted file mode 100644
index eddce481cb346..0000000000000
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-stage.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-base_images:
-  cli:
-    name: "4.14"
-    namespace: ocp
-    tag: cli
-  upi-installer:
-    name: "4.14"
-    namespace: ocp
-    tag: upi-installer
-build_root:
-  image_stream_tag:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.23-openshift-4.19
-canonical_go_repository: github.com/grafana/tempo-operator
-images:
-  items:
-  - context_dir: .
-    dockerfile_path: tests/Dockerfile
-    to: obs-tests-runner
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.14"
-resources:
-  '*':
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: tempo-stage-tests
-  cron: 0 0 30 2 *
-  reporter_config:
-    channel: '#distributed-tracing-qe'
-    job_states_to_report:
-    - success
-    - failure
-    - error
-    report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
-      ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
-      Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
-      {{end}}'
-  steps:
-    cluster_profile: azure-observability
-    env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
-      OPERATORS: |
-        [
-            {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
-            {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
-            {"name": "servicemeshoperator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
-            {"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
-            {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
-        ]
-      SKIP_TESTS: tests/e2e-openshift-object-stores/*
-    test:
-    - ref: distributed-tracing-install-tempo-konflux-catalogsource
-    - ref: install-operators
-    - ref: distributed-tracing-tests-tempo-stage
-    workflow: cucushift-installer-rehearse-azure-ipi
-zz_generated_metadata:
-  branch: main
-  org: openshift
-  repo: grafana-tempo-operator
-  variant: tempo-product-ocp-4.14-stage
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml
index cb7b3d64ebfd3..146c8c4719225 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml
@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.16"
 resources:
   '*':
@@ -44,6 +43,9 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -55,6 +57,9 @@ tests:
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
         tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-serverless/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - ref: openshift-observability-ibm-z-cluster-destroy
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -69,6 +74,9 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:
@@ -76,7 +84,6 @@ tests:
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: openshift-observability-ibm-z
 zz_generated_metadata:
   branch: main
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-fips-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-fips-stage.yaml
index d245e82438f59..71d6b26c748ff 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-fips-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-fips-stage.yaml
@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.17"
 resources:
   '*':
@@ -43,10 +42,12 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: gcp-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       FIPS_ENABLED: "true"
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157124
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -57,13 +58,15 @@ tests:
             {"name": "lightspeed-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-lightspeed", "target_namespaces": "openshift-lightspeed", "operator_group": "openshift-lightspeed"},
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
-      SKIP_TESTS: tests/e2e-openshift-object-stores/*
+      SKIP_TESTS: tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml
index 5b66159121bb6..db77c5b66371d 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml
@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.17"
 resources:
   '*':
@@ -44,7 +43,10 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       FIPS_ENABLED: "false"
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OCP_CLUSTER_VERSION: stable-4.17
       OPERATORS: |
         [
@@ -57,6 +59,9 @@ tests:
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
         tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-serverless/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - ref: openshift-observability-ibm-p-cluster-destroy
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -71,6 +76,9 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:
@@ -78,7 +86,6 @@ tests:
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: openshift-observability-ibm-p
 zz_generated_metadata:
   branch: main
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-stage.yaml
index 4322009fffeff..44bda7528541e 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-stage.yaml
@@ -16,9 +16,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.19"
 resources:
   '*':
@@ -49,6 +48,9 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157126
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -60,11 +62,13 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: gather
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: generic-claim
 zz_generated_metadata:
   branch: main
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.20-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.20-stage.yaml
index ee338ffd7e8e7..18dd22e96e21d 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.20-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.20-stage.yaml
@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.20"
 resources:
   '*':
@@ -31,15 +30,6 @@ resources:
       memory: 200Mi
 tests:
 - as: tempo-stage-tests
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    labels:
-      region: us-east-2
-    owner: obs
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.20"
   cron: 0 0 30 2 *
   reporter_config:
     channel: '#distributed-tracing-qe'
@@ -52,7 +42,11 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
+    cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157128
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -64,12 +58,14 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: generic-claim
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.21-stage.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.21-stage.yaml
index 66f0d627afeee..95a8c5024a93d 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.21-stage.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.21-stage.yaml
@@ -16,9 +16,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.21"
 resources:
   '*':
@@ -41,6 +40,9 @@ tests:
   steps:
     cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157127
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -52,11 +54,13 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml
index 08c573ca18930..2da10b9f87d49 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml
@@ -7,6 +7,10 @@ base_images:
     name: "4.12"
     namespace: origin
     tag: operator-sdk
+  upi-installer:
+    name: "4.12"
+    namespace: ocp
+    tag: upi-installer
 binary_build_commands: make build
 build_root:
   image_stream_tag:
@@ -32,9 +36,8 @@ operator:
     with: pipeline:tempo-operator
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.12"
 resources:
   '*':
@@ -42,16 +45,11 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- always_run: false
-  as: security-sast-tempo
-  steps:
-    env:
-      PROJECT_NAME: tempo-operator
-    workflow: openshift-ci-security
 - as: tempo-upstream-tests
   steps:
     cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -60,6 +58,9 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - as: install
       cli: latest
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml
index ae1ccc3436b49..b141d50212b19 100644
--- a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml
+++ b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml
@@ -46,6 +46,7 @@ tests:
   steps:
     cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -56,6 +57,9 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - as: install
       cli: latest
diff --git a/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-periodics.yaml b/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-periodics.yaml
index af900482dad5e..679533e85b0d0 100644
--- a/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-periodics.yaml
@@ -17,7 +17,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
     ci-operator.openshift.io/variant: ocp-4.16-disconnected
     ci.openshift.io/generator: prowgen
-    job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-distributed-tracing-qe-main-ocp-4.16-disconnected-distributed-tracing-tests-disconnected
   reporter_config:
diff --git a/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-presubmits.yaml b/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-presubmits.yaml
index 4c0fc02ce5214..ca3f1548e32d1 100644
--- a/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main-presubmits.yaml
@@ -14,7 +14,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: ocp-4.16-disconnected
       ci.openshift.io/generator: prowgen
-      job-release: "4.16"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-distributed-tracing-qe-main-ocp-4.16-disconnected-images
     rerun_command: /test ocp-4.16-disconnected-images
diff --git a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-periodics.yaml b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-periodics.yaml
index 40158354d2bc3..061831d40cc0e 100644
--- a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-periodics.yaml
+++ b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-periodics.yaml
@@ -87,11 +87,10 @@ periodics:
     sparse_checkout_files:
     - tests/Dockerfile
   labels:
-    ci-operator.openshift.io/cloud: azure4
-    ci-operator.openshift.io/cloud-cluster-profile: azure-observability
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
     ci-operator.openshift.io/variant: tempo-product-ocp-4.12-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.12-stage-tempo-stage-tests
   reporter_config:
@@ -189,7 +188,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: azure-observability
     ci-operator.openshift.io/variant: tempo-product-ocp-4.14-arm-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.14"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-arm-stage-tempo-stage-tests
   reporter_config:
@@ -268,104 +266,6 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
-- agent: kubernetes
-  cluster: build08
-  cron: 0 0 30 2 *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - tests/Dockerfile
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    path_alias: github.com/grafana/tempo-operator
-    repo: grafana-tempo-operator
-    sparse_checkout_files:
-    - tests/Dockerfile
-  labels:
-    ci-operator.openshift.io/cloud: azure4
-    ci-operator.openshift.io/cloud-cluster-profile: azure-observability
-    ci-operator.openshift.io/variant: tempo-product-ocp-4.14-stage
-    ci.openshift.io/generator: prowgen
-    job-release: "4.14"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-stage-tempo-stage-tests
-  reporter_config:
-    slack:
-      channel: '#distributed-tracing-qe'
-      job_states_to_report:
-      - success
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
-        Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> {{end}}'
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --lease-server-credentials-file=/etc/boskos/credentials
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --target=tempo-stage-tests
-      - --variant=tempo-product-ocp-4.14-stage
-      command:
-      - ci-operator
-      env:
-      - name: HTTP_SERVER_IP
-        valueFrom:
-          fieldRef:
-            fieldPath: status.podIP
-      image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
-      imagePullPolicy: Always
-      name: ""
-      ports:
-      - containerPort: 8080
-        name: http
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - mountPath: /etc/boskos
-        name: boskos
-        readOnly: true
-      - mountPath: /secrets/ci-pull-credentials
-        name: ci-pull-credentials
-        readOnly: true
-      - mountPath: /secrets/gcs
-        name: gcs-credentials
-        readOnly: true
-      - mountPath: /secrets/manifest-tool
-        name: manifest-tool-local-pusher
-        readOnly: true
-      - mountPath: /etc/pull-secret
-        name: pull-secret
-        readOnly: true
-      - mountPath: /etc/report
-        name: result-aggregator
-        readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - name: boskos
-      secret:
-        items:
-        - key: credentials
-          path: credentials
-        secretName: boskos-credentials
-    - name: ci-pull-credentials
-      secret:
-        secretName: ci-pull-credentials
-    - name: manifest-tool-local-pusher
-      secret:
-        secretName: manifest-tool-local-pusher
-    - name: pull-secret
-      secret:
-        secretName: registry-pull-credentials
-    - name: result-aggregator
-      secret:
-        secretName: result-aggregator
 - agent: kubernetes
   cluster: build08
   cron: 0 0 30 2 *
@@ -383,7 +283,6 @@ periodics:
   labels:
     ci-operator.openshift.io/variant: tempo-product-ocp-4.16-ibm-z-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.16"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.16-ibm-z-stage-tempo-stage-tests
   reporter_config:
@@ -477,11 +376,10 @@ periodics:
     sparse_checkout_files:
     - tests/Dockerfile
   labels:
-    ci-operator.openshift.io/cloud: azure4
-    ci-operator.openshift.io/cloud-cluster-profile: azure-observability
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
     ci-operator.openshift.io/variant: tempo-product-ocp-4.17-fips-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-fips-stage-tempo-stage-tests
   reporter_config:
@@ -577,7 +475,6 @@ periodics:
   labels:
     ci-operator.openshift.io/variant: tempo-product-ocp-4.17-ibm-p-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-ibm-p-stage-tempo-stage-tests
   reporter_config:
@@ -771,7 +668,6 @@ periodics:
   labels:
     ci-operator.openshift.io/variant: tempo-product-ocp-4.19-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.19"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.19-stage-tempo-stage-tests
   reporter_config:
@@ -975,9 +871,10 @@ periodics:
     sparse_checkout_files:
     - tests/Dockerfile
   labels:
+    ci-operator.openshift.io/cloud: gcp
+    ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
     ci-operator.openshift.io/variant: tempo-product-ocp-4.20-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.20"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.20-stage-tempo-stage-tests
   reporter_config:
@@ -995,7 +892,6 @@ periodics:
     containers:
     - args:
       - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
       - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
@@ -1028,9 +924,6 @@ periodics:
       - mountPath: /secrets/gcs
         name: gcs-credentials
         readOnly: true
-      - mountPath: /secrets/hive-hive-credentials
-        name: hive-hive-credentials
-        readOnly: true
       - mountPath: /secrets/manifest-tool
         name: manifest-tool-local-pusher
         readOnly: true
@@ -1051,9 +944,6 @@ periodics:
     - name: ci-pull-credentials
       secret:
         secretName: ci-pull-credentials
-    - name: hive-hive-credentials
-      secret:
-        secretName: hive-hive-credentials
     - name: manifest-tool-local-pusher
       secret:
         secretName: manifest-tool-local-pusher
@@ -1180,7 +1070,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
     ci-operator.openshift.io/variant: tempo-product-ocp-4.21-stage
     ci.openshift.io/generator: prowgen
-    job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.21-stage-tempo-stage-tests
   reporter_config:
diff --git a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml
index 298ebb1100cb5..48a3f411489f2 100644
--- a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml
@@ -14,7 +14,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.12-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.12-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -74,7 +73,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.14-arm-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.14"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-arm-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -120,66 +118,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )tempo-product-ocp-4.14-arm-stage-images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build05
-    context: ci/prow/tempo-product-ocp-4.14-stage-images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - tests/Dockerfile
-    labels:
-      ci-operator.openshift.io/variant: tempo-product-ocp-4.14-stage
-      ci.openshift.io/generator: prowgen
-      job-release: "4.14"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-stage-images
-    path_alias: github.com/grafana/tempo-operator
-    rerun_command: /test tempo-product-ocp-4.14-stage-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        - --variant=tempo-product-ocp-4.14-stage
-        command:
-        - ci-operator
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /secrets/manifest-tool
-          name: manifest-tool-local-pusher
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )tempo-product-ocp-4.14-stage-images,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -194,7 +132,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.16-ibm-z-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.16"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.16-ibm-z-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -254,7 +191,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.17-fips-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.17"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-fips-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -314,7 +250,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.17-ibm-p-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.17"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-ibm-p-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -434,7 +369,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.19-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.19"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.19-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -554,7 +488,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.20-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.20"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.20-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -674,7 +607,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: tempo-product-ocp-4.21-stage
       ci.openshift.io/generator: prowgen
-      job-release: "4.21"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.21-stage-images
     path_alias: github.com/grafana/tempo-operator
@@ -735,7 +667,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-upstream-ocp-4.12-amd64-ci-index-tempo-bundle
     path_alias: github.com/grafana/tempo-operator
@@ -796,7 +727,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-upstream-ocp-4.12-amd64-images
     path_alias: github.com/grafana/tempo-operator
@@ -842,92 +772,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )upstream-ocp-4.12-amd64-images,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build05
-    context: ci/prow/upstream-ocp-4.12-amd64-security-sast-tempo
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - tests/Dockerfile
-    labels:
-      ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64
-      ci.openshift.io/generator: prowgen
-      job-release: "4.12"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-grafana-tempo-operator-main-upstream-ocp-4.12-amd64-security-sast-tempo
-    path_alias: github.com/grafana/tempo-operator
-    rerun_command: /test upstream-ocp-4.12-amd64-security-sast-tempo
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --lease-server-credentials-file=/etc/boskos/credentials
-        - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=security-sast-tempo
-        - --variant=upstream-ocp-4.12-amd64
-        command:
-        - ci-operator
-        env:
-        - name: HTTP_SERVER_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
-        imagePullPolicy: Always
-        name: ""
-        ports:
-        - containerPort: 8080
-          name: http
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/boskos
-          name: boskos
-          readOnly: true
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
-        - mountPath: /secrets/gcs
-          name: gcs-credentials
-          readOnly: true
-        - mountPath: /secrets/manifest-tool
-          name: manifest-tool-local-pusher
-          readOnly: true
-        - mountPath: /etc/pull-secret
-          name: pull-secret
-          readOnly: true
-        - mountPath: /etc/report
-          name: result-aggregator
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: boskos
-        secret:
-          items:
-          - key: credentials
-            path: credentials
-          secretName: boskos-credentials
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
-      - name: manifest-tool-local-pusher
-        secret:
-          secretName: manifest-tool-local-pusher
-      - name: pull-secret
-        secret:
-          secretName: registry-pull-credentials
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
-    trigger: (?m)^/test( | .* )(upstream-ocp-4.12-amd64-security-sast-tempo|remaining-required),?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -945,7 +789,6 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-observability
       ci-operator.openshift.io/variant: upstream-ocp-4.12-amd64
       ci.openshift.io/generator: prowgen
-      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-grafana-tempo-operator-main-upstream-ocp-4.12-amd64-tempo-upstream-tests
     path_alias: github.com/grafana/tempo-operator
diff --git a/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh b/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh
index d0572b3c13f2d..dd35d86c1f429 100644
--- a/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh
+++ b/ci-operator/step-registry/distributed-tracing/install/disconnected/distributed-tracing-install-disconnected-commands.sh
@@ -158,7 +158,7 @@ EOF
 
     run_command "cd /tmp"
     run_command "curl -L -o oc-mirror.tar.gz https://mirror.openshift.com/pub/openshift-v4/amd64/clients/ocp/latest/oc-mirror.tar.gz && tar -xvzf oc-mirror.tar.gz && chmod +x oc-mirror"
-    run_command "./oc-mirror --config=/tmp/image-set.yaml docker://${MIRROR_REGISTRY_HOST} --continue-on-error --ignore-history --source-skip-tls --dest-skip-tls || true"
+    run_command "./oc-mirror --v1 --config=/tmp/image-set.yaml docker://${MIRROR_REGISTRY_HOST} --continue-on-error --ignore-history --source-skip-tls --dest-skip-tls || true"
     run_command "cp oc-mirror-workspace/results-*/mapping.txt ."
     run_command "sed -e 's|registry.redhat.io|registry.stage.redhat.io|g' -e 's|brew.registry.stage.redhat.io/rh-osbs/tempo|brew.registry.redhat.io/rh-osbs/iib|g' -e 's|brew.registry.stage.redhat.io/rh-osbs/otel|brew.registry.redhat.io/rh-osbs/iib|g' mapping.txt > mapping-stage.txt"
     run_command "oc image mirror -a ${REG_CREDS} -f mapping-stage.txt --insecure --filter-by-os='.*'"
diff --git a/ci-operator/step-registry/mirror-images/tag-images/mirror-images-tag-images-commands.sh b/ci-operator/step-registry/mirror-images/tag-images/mirror-images-tag-images-commands.sh
index 4dba4284325b9..47c3180f8bb9a 100644
--- a/ci-operator/step-registry/mirror-images/tag-images/mirror-images-tag-images-commands.sh
+++ b/ci-operator/step-registry/mirror-images/tag-images/mirror-images-tag-images-commands.sh
@@ -106,8 +106,21 @@ if [[ "${MIRROR_IN_BASTION}" == "yes" ]]; then
 
     cmd="${OC_BIN} image mirror ${args[*]}"
     echo "Remote Command: ${cmd}"
-    # shellcheck disable=SC2090
-    ssh ${ssh_options} ${BASTION_SSH_USER}@${BASTION_IP} "${cmd}"
+    max_attempts=3
+    attempt=1
+    while [[ $attempt -le $max_attempts ]]; do
+        # shellcheck disable=SC2090
+        if ssh ${ssh_options} ${BASTION_SSH_USER}@${BASTION_IP} "${cmd}"; then
+            break
+        fi
+        if [[ $attempt -eq $max_attempts ]]; then
+            echo "mirror-images-tag-images failed after ${max_attempts} attempts"
+            exit 1
+        fi
+        echo "Attempt ${attempt} failed, retrying in 30s..."
+        sleep 30
+        ((attempt++))
+    done
 else
     args+=(--registry-config="${new_pull_secret}")
     args+=(--filename="${tag_images_list}")
@@ -120,5 +133,18 @@ else
         echo "This oc version does not support --keep-manifest-list, skip it."
     fi
     cmd="${OC_BIN} image mirror ${args[*]}"
-    run_command "${cmd}"
+    max_attempts=3
+    attempt=1
+    while [[ $attempt -le $max_attempts ]]; do
+        if run_command "${cmd}"; then
+            break
+        fi
+        if [[ $attempt -eq $max_attempts ]]; then
+            echo "mirror-images-tag-images failed after ${max_attempts} attempts"
+            exit 1
+        fi
+        echo "Attempt ${attempt} failed, retrying in 30s..."
+        sleep 30
+        ((attempt++))
+    done
 fi
diff --git a/ci-operator/step-registry/openshift-observability/qe-agent/openshift-observability-qe-agent-ref.yaml b/ci-operator/step-registry/openshift-observability/qe-agent/openshift-observability-qe-agent-ref.yaml
index 6434402bac210..470d4a4d50735 100644
--- a/ci-operator/step-registry/openshift-observability/qe-agent/openshift-observability-qe-agent-ref.yaml
+++ b/ci-operator/step-registry/openshift-observability/qe-agent/openshift-observability-qe-agent-ref.yaml
@@ -3,7 +3,7 @@ ref:
   from: obs-tests-runner
   best_effort: true
   commands: openshift-observability-qe-agent-commands.sh
-  timeout: 40m0s
+  timeout: 1h30m0s
   grace_period: 2m0s
   env:
   - name: AGENT_SKILL_URL
diff --git a/core-services/prow/02_config/_boskos.yaml b/core-services/prow/02_config/_boskos.yaml
index c9e7f7ef5d7fa..7b47d00b4eaa2 100644
--- a/core-services/prow/02_config/_boskos.yaml
+++ b/core-services/prow/02_config/_boskos.yaml
@@ -3663,9 +3663,31 @@ resources:
   state: free
   type: azure-oadp-qe-quota-slice
 - names:
-  - westus--azure-observability-quota-slice-0
-  - westus--azure-observability-quota-slice-1
-  - westus--azure-observability-quota-slice-2
+  - westus--azure-observability-quota-slice-00
+  - westus--azure-observability-quota-slice-01
+  - westus--azure-observability-quota-slice-02
+  - westus--azure-observability-quota-slice-03
+  - westus--azure-observability-quota-slice-04
+  - westus--azure-observability-quota-slice-05
+  - westus--azure-observability-quota-slice-06
+  - westus--azure-observability-quota-slice-07
+  - westus--azure-observability-quota-slice-08
+  - westus--azure-observability-quota-slice-09
+  - westus--azure-observability-quota-slice-10
+  - westus--azure-observability-quota-slice-11
+  - westus--azure-observability-quota-slice-12
+  - westus--azure-observability-quota-slice-13
+  - westus--azure-observability-quota-slice-14
+  - westus--azure-observability-quota-slice-15
+  - westus--azure-observability-quota-slice-16
+  - westus--azure-observability-quota-slice-17
+  - westus--azure-observability-quota-slice-18
+  - westus--azure-observability-quota-slice-19
+  - westus--azure-observability-quota-slice-20
+  - westus--azure-observability-quota-slice-21
+  - westus--azure-observability-quota-slice-22
+  - westus--azure-observability-quota-slice-23
+  - westus--azure-observability-quota-slice-24
   state: free
   type: azure-observability-quota-slice
 - names:
@@ -4238,11 +4260,6 @@ resources:
   - us-central1--gcp-observability-quota-slice-22
   - us-central1--gcp-observability-quota-slice-23
   - us-central1--gcp-observability-quota-slice-24
-  - us-central1--gcp-observability-quota-slice-25
-  - us-central1--gcp-observability-quota-slice-26
-  - us-central1--gcp-observability-quota-slice-27
-  - us-central1--gcp-observability-quota-slice-28
-  - us-central1--gcp-observability-quota-slice-29
   state: free
   type: gcp-observability-quota-slice
 - names:
diff --git a/core-services/prow/02_config/generate-boskos.py b/core-services/prow/02_config/generate-boskos.py
index e06ea11526936..6928540aca694 100755
--- a/core-services/prow/02_config/generate-boskos.py
+++ b/core-services/prow/02_config/generate-boskos.py
@@ -243,7 +243,7 @@
         'centralus': 15
     },
     'azure-observability-quota-slice': {
-        'westus': 3
+        'westus': 25
     },
     'azure-hcp-qe-quota-slice': {
         'westus': 5,
@@ -350,7 +350,7 @@
         'us-central1': 45,
     },
     'gcp-observability-quota-slice': {
-        'us-central1': 30,
+        'us-central1': 25,
     },
     'gcp-qe-c3-metal-quota-slice': {
         'us-central1': 4,