diff --git a/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml b/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
index 976445f30a8ed..9e3daa02cef5d 100644
--- a/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
+++ b/ci-operator/config/opendatahub-io/opendatahub-operator/opendatahub-io-opendatahub-operator-main.yaml
@@ -3,48 +3,169 @@ base_images:
     name: cli-operator-sdk
     namespace: ocp
     tag: v1.39.2
+  operator-sdk:
+    name: "4.19"
+    namespace: origin
+    tag: operator-sdk
+  tls-scanner-tool:
+    name: "4.22"
+    namespace: ocp
+    tag: tls-scanner-tool
   ubi:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.20
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.26-openshift-5.0
+  use_build_cache: true
 images:
-- context_dir: .
-  dockerfile_path: Dockerfiles/Dockerfile
-  from: ubi
-  to: opendatahub-operator
+  items:
+  - context_dir: .
+    dockerfile_path: Dockerfiles/Dockerfile
+    from: ubi
+    optional: true
+    to: opendatahub-operator
+  - context_dir: .
+    dockerfile_path: Dockerfiles/rhoai.Dockerfile
+    from: ubi
+    optional: true
+    to: opendatahub-operator-rhoai
 operator:
   bundles:
   - as: opendatahub-operator-bundle
     dockerfile_path: Dockerfiles/bundle.Dockerfile
     skip_building_index: true
+  - as: opendatahub-operator-rhoai-bundle
+    dockerfile_path: Dockerfiles/rhoai-bundle.Dockerfile
+    skip_building_index: true
   substitutions:
-  - pullspec: REPLACE_IMAGE:latest
+  - pullspec: REPLACE_IMAGE:v0.0.0-rhoai-placeholder
+    with: pipeline:opendatahub-operator-rhoai
+  - pullspec: REPLACE_IMAGE:v0.0.0-placeholder
     with: pipeline:opendatahub-operator
+prowgen:
+  skip_operator_presubmits: true
 releases:
   latest:
     release:
+      architecture: multi
       channel: stable
-      version: "4.19"
+      version: "4.20"
 resources:
   '*':
     requests:
-      cpu: 200m
+      cpu: 400m
       memory: 200Mi
 tests:
-- as: opendatahub-operator-pr-image-mirror
+- as: opendatahub-operator-e2e
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: opendatahub
+    product: ocp
+    timeout: 2h0m0s
+    version: "4.20"
+  skip_if_only_changed: ^\.github/|^build/|^docs/|\.[mM][dD]$|^.gitignore$|^golangci|^crd-ref-docs\.config|^OWNERS$|^PROJECT$|^LICENSE$|^OWNERS_ALIASES$|^cmd/[^/]+/|^\.[^/]+\.(yaml|yml)$|^(component-params-env|semgrep)\.(yaml|yml)$|^.gitleaksignore$|^.yamllint$|^api/cloudmanager/|^config/cloudmanager/|^internal/controller/cloudmanager/|^pkg/controller/cloudmanager/|^tests/e2e/cloudmanager/|^hack/update-cloudmanager-rbac\.sh$|^pkg/operatorconfig/cloudmanager\.go$|^pkg/utils/test/cloudmanager/
   steps:
+    allow_best_effort_post_steps: true
+    allow_skip_on_success: true
     dependencies:
       SOURCE_IMAGE_REF: opendatahub-operator
     env:
       IMAGE_REPO: opendatahub-operator
-    workflow: opendatahub-io-ci-image-mirror
+    pre:
+    - ref: ipi-install-rbac
+    - ref: opendatahub-operator-e2e-cluster-preflight-health-check
+    test:
+    - as: install
+      cli: latest
+      commands: |
+        oc create namespace opendatahub-operator
+        oc label ns opendatahub-operator security.openshift.io/scc.podSecurityLabelSync=true --overwrite
+        operator-sdk run bundle --timeout=5m -n opendatahub-operator "$OO_BUNDLE" --verbose
+        oc wait --for condition=Available --timeout=3m -n opendatahub-operator deployment opendatahub-operator-controller-manager
+      dependencies:
+      - env: OO_BUNDLE
+        name: opendatahub-operator-bundle
+      from: operator-sdk
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+      timeout: 10m0s
+    - ref: opendatahub-io-ci-image-mirror-generic-claim
+    - as: e2e
+      cli: latest
+      commands: |
+        unset GOFLAGS
+        make e2e-test -e E2E_TEST_FLAGS="-timeout 80m" -e OPERATOR_NAMESPACE=opendatahub-operator
+      from: src
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 3Gi
+      timeout: 3h0m0s
+    workflow: generic-claim
+- as: opendatahub-operator-rhoai-e2e
+  cluster_claim:
+    architecture: amd64
+    cloud: aws
+    owner: opendatahub
+    product: ocp
+    timeout: 2h0m0s
+    version: "4.20"
+  skip_if_only_changed: ^\.github/|^build/|^docs/|\.[mM][dD]$|^.gitignore$|^golangci|^crd-ref-docs\.config|^OWNERS$|^PROJECT$|^LICENSE$|^OWNERS_ALIASES$|^cmd/[^/]+/|^\.[^/]+\.(yaml|yml)$|^(component-params-env|semgrep)\.(yaml|yml)$|^.gitleaksignore$|^.yamllint$|^api/cloudmanager/|^config/cloudmanager/|^internal/controller/cloudmanager/|^pkg/controller/cloudmanager/|^tests/e2e/cloudmanager/|^hack/update-cloudmanager-rbac\.sh$|^pkg/operatorconfig/cloudmanager\.go$|^pkg/utils/test/cloudmanager/
+  steps:
+    allow_best_effort_post_steps: true
+    allow_skip_on_success: true
+    dependencies:
+      SOURCE_IMAGE_REF: opendatahub-operator-rhoai
+    env:
+      IMAGE_REPO: opendatahub-operator
+      PQC_CHECK: "true"
+      SCAN_NAMESPACE: redhat-ods-operator,redhat-ods-applications
+    pre:
+    - ref: ipi-install-rbac
+    - ref: opendatahub-operator-e2e-cluster-preflight-health-check
+    - ref: opendatahub-io-ci-rhoai-quay-pull-secret
+    test:
+    - as: install
+      cli: latest
+      commands: |
+        oc create namespace redhat-ods-operator
+        oc label ns redhat-ods-operator security.openshift.io/scc.podSecurityLabelSync=true --overwrite
+        operator-sdk run bundle --timeout=5m -n redhat-ods-operator "$OO_BUNDLE" --verbose
+      dependencies:
+      - env: OO_BUNDLE
+        name: opendatahub-operator-rhoai-bundle
+      from: operator-sdk
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+      timeout: 10m0s
+    - ref: opendatahub-io-ci-image-mirror-generic-claim
+    - as: e2e
+      cli: latest
+      commands: |
+        unset GOFLAGS
+        E2E_TEST_DSC_MONITORING_NAMESPACE=redhat-ods-monitoring make e2e-test -e ODH_PLATFORM_TYPE=rhoai -e E2E_TEST_FLAGS="-timeout 80m" -e OPERATOR_NAMESPACE=redhat-ods-operator
+      from: src
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 3Gi
+      timeout: 3h0m0s
+    post:
+    - ref: tls-scanner-run
+      best_effort: true
+    workflow: generic-claim
 - as: opendatahub-operator-image-mirror
   postsubmit: true
+  skip_if_only_changed: ^\.github/|^docs/|\.[mM][dD]$|^.gitignore$|^golangci|^crd-ref-docs\.config|^OWNERS$|^PROJECT$|^LICENSE$|^OWNERS_ALIASES$|^cmd/[^/]+/|^\.[^/]+\.(yaml|yml)$|^(component-params-env|semgrep)\.(yaml|yml)$|^.gitleaksignore$|^.yamllint$
   steps:
     dependencies:
       SOURCE_IMAGE_REF: opendatahub-operator
@@ -61,27 +182,16 @@ tests:
       IMAGE_REPO: opendatahub-operator
       IMAGE_TAG: latest
     workflow: opendatahub-io-ci-image-mirror
-- as: opendatahub-operator-e2e
-  skip_if_only_changed: ^\.github/|^docs/|\.[mM][dD]$|^.gitignore$|^golangci|^crd-ref-docs\.config|^OWNERS$|^PROJECT$|^LICENSE$|^OWNERS_ALIASES$|^Makefile$
+- as: opendatahub-operator-rhoai-image-mirror
+  postsubmit: true
+  skip_if_only_changed: ^\.github/|^docs/|\.[mM][dD]$|^.gitignore$|^golangci|^crd-ref-docs\.config|^OWNERS$|^PROJECT$|^LICENSE$|^OWNERS_ALIASES$|^cmd/[^/]+/|^\.[^/]+\.(yaml|yml)$|^(component-params-env|semgrep)\.(yaml|yml)$|^.gitleaksignore$|^.yamllint$
   steps:
-    cluster_profile: gcp-opendatahub
     dependencies:
-      OO_BUNDLE: opendatahub-operator-bundle
+      SOURCE_IMAGE_REF: opendatahub-operator-rhoai
     env:
-      COMPUTE_NODE_TYPE: n2-standard-8
-      OO_INSTALL_NAMESPACE: openshift-operators
-    test:
-    - as: e2e
-      cli: latest
-      commands: |
-        unset GOFLAGS
-        make e2e-test -e OPERATOR_NAMESPACE=openshift-operators
-      from: src
-      resources:
-        requests:
-          cpu: 2000m
-          memory: 3Gi
-    workflow: optional-operators-ci-operator-sdk-gcp
+      IMAGE_REPO: opendatahub-operator
+      RELEASE_VERSION: rhoai
+    workflow: opendatahub-io-ci-image-mirror
 zz_generated_metadata:
   branch: main
   org: opendatahub-io