diff --git a/ci-operator/config/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main.yaml b/ci-operator/config/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main.yaml
index a7149b73a21e9..69c9487e6086c 100644
--- a/ci-operator/config/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main.yaml
+++ b/ci-operator/config/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main.yaml
@@ -29,9 +29,6 @@ images:
   - context_dir: .
     dockerfile_path: ./packages/autorag/Dockerfile.workspace
     to: odh-mod-arch-autorag-image
-  - context_dir: .
-    dockerfile_path: ./packages/agent-ops/Dockerfile.workspace
-    to: odh-mod-arch-agent-ops-image
 promotion:
   to:
   - namespace: opendatahub-io
@@ -178,22 +175,6 @@ tests:
       IMAGE_REPO: odh-mod-arch-autorag
       RELEASE_VERSION: main
     workflow: opendatahub-io-ci-image-mirror
-- as: odh-mod-arch-agent-ops-pr-image-mirror
-  steps:
-    dependencies:
-      SOURCE_IMAGE_REF: odh-mod-arch-agent-ops-image
-    env:
-      IMAGE_REPO: odh-mod-arch-agent-ops
-    workflow: opendatahub-io-ci-image-mirror
-- as: odh-mod-arch-agent-ops-image-mirror
-  postsubmit: true
-  steps:
-    dependencies:
-      SOURCE_IMAGE_REF: odh-mod-arch-agent-ops-image
-    env:
-      IMAGE_REPO: odh-mod-arch-agent-ops
-      RELEASE_VERSION: main
-    workflow: opendatahub-io-ci-image-mirror
 zz_generated_metadata:
   branch: main
   org: opendatahub-io
diff --git a/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-postsubmits.yaml b/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-postsubmits.yaml
index 5ddbff57e81c0..e4736eefc4de6 100644
--- a/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-postsubmits.yaml
+++ b/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-postsubmits.yaml
@@ -9,7 +9,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -78,7 +77,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -163,92 +161,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
-      - packages/automl/Dockerfile.workspace
-      - packages/autorag/Dockerfile.workspace
-      - packages/eval-hub/Dockerfile.workspace
-      - packages/gen-ai/Dockerfile.workspace
-      - packages/maas/Dockerfile.workspace
-      - packages/mlflow/Dockerfile.workspace
-      - packages/model-registry/Dockerfile.workspace
-    labels:
-      ci.openshift.io/generator: prowgen
-    max_concurrency: 1
-    name: branch-ci-opendatahub-io-odh-dashboard-main-odh-mod-arch-agent-ops-image-mirror
-    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=odh-mod-arch-agent-ops-image-mirror
-        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
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build08
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -333,7 +245,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -418,7 +329,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -503,7 +413,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -588,7 +497,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -673,7 +581,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -758,7 +665,6 @@ postsubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
diff --git a/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-presubmits.yaml b/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-presubmits.yaml
index 59be1039d8cdf..7ae63bed9c8e0 100644
--- a/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-presubmits.yaml
+++ b/ci-operator/jobs/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main-presubmits.yaml
@@ -11,7 +11,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -75,7 +74,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -153,95 +151,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )odh-dashboard-pr-image-mirror,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build04
-    context: ci/prow/odh-mod-arch-agent-ops-pr-image-mirror
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
-      - packages/automl/Dockerfile.workspace
-      - packages/autorag/Dockerfile.workspace
-      - packages/eval-hub/Dockerfile.workspace
-      - packages/gen-ai/Dockerfile.workspace
-      - packages/maas/Dockerfile.workspace
-      - packages/mlflow/Dockerfile.workspace
-      - packages/model-registry/Dockerfile.workspace
-    labels:
-      ci.openshift.io/generator: prowgen
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-opendatahub-io-odh-dashboard-main-odh-mod-arch-agent-ops-pr-image-mirror
-    rerun_command: /test odh-mod-arch-agent-ops-pr-image-mirror
-    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=odh-mod-arch-agent-ops-pr-image-mirror
-        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( | .* )odh-mod-arch-agent-ops-pr-image-mirror,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -253,7 +162,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -342,7 +250,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -431,7 +338,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -520,7 +426,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -609,7 +514,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -698,7 +602,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace
@@ -787,7 +690,6 @@ presubmits:
     decoration_config:
       sparse_checkout_files:
       - Dockerfile
-      - packages/agent-ops/Dockerfile.workspace
       - packages/automl/Dockerfile.workspace
       - packages/autorag/Dockerfile.workspace
       - packages/eval-hub/Dockerfile.workspace