diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS
deleted file mode 100644
index 5e1b9317dc2c8..0000000000000
--- a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/OWNERS
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/bare-metal-fulfillment-operator root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-approvers:
-- adriengentil
-- carbonin
-- larsks
-options: {}
-reviewers:
-- adriengentil
-- carbonin
-- larsks
diff --git a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml b/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml
deleted file mode 100644
index e187b5848b6bf..0000000000000
--- a/ci-operator/config/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.21
-images:
-  items:
-  - dockerfile_path: Containerfile
-    to: bare-metal-fulfillment-operator
-promotion: {}
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: bare-metal-fulfillment-operator
diff --git a/ci-operator/config/osac-project/fulfillment-service/OWNERS b/ci-operator/config/osac-project/fulfillment-service/OWNERS
deleted file mode 100644
index eecc191dc9e59..0000000000000
--- a/ci-operator/config/osac-project/fulfillment-service/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/fulfillment-service root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml b/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml
deleted file mode 100644
index 2688035ed04f1..0000000000000
--- a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-base_images:
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  origin-cli:
-    name: "4.20"
-    namespace: ocp
-    tag: cli
-  osac-installer:
-    name: latest
-    namespace: osac-project
-    tag: osac-installer
-  osac-test-infra:
-    name: latest
-    namespace: osac-project
-    tag: osac-test-infra
-binary_build_commands: GOFLAGS="-mod=readonly" go build -o /tmp/osac ./cmd/osac
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.26-openshift-5.0
-images:
-  items:
-  - dockerfile_literal: |
-      FROM src
-      WORKDIR /app
-      COPY osac /app/osac
-    from: src
-    inputs:
-      bin:
-        paths:
-        - destination_dir: .
-          source_path: /tmp/osac
-    to: osac-cli
-  - dockerfile_path: Containerfile
-    to: fulfillment-service
-  - dockerfile_literal: |
-      FROM src
-    from: src
-    to: fulfillment-service-code
-  - dockerfile_literal: |
-      FROM osac-installer
-      COPY manifests/ /installer/base/osac-fulfillment-service/manifests/
-      COPY osac /usr/local/bin/osac
-    inputs:
-      bin:
-        paths:
-        - destination_dir: .
-          source_path: /tmp/osac
-      osac-installer:
-        as:
-        - osac-installer
-    to: osac-installer-with-pr
-promotion:
-  to:
-  - excluded_images:
-    - osac-installer-with-pr
-    name: latest
-    namespace: osac-project
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: unit
-  commands: echo "Test"
-  container:
-    from: src
-  skip_if_only_changed: ^.*\.(md|adoc)$|^LICENSE$|^charts/|^it/|^docs/|^\.ai-bot/|^\.claude/|^\.vscode/|^\.idea/|^\.pre-commit-config.*|^\.yamllint\.yaml$|^\.golangci\.yml$|^\.copr/|^\.goreleaser\.yaml$|^\.dockerignore$|^\.gitattributes$|^\.gitignore$|^\.gitleaks\.toml$|^pyproject\.toml$|^\.python-version$|^uv\.lock$|^buf\.|^CLAUDE\.md$|^AGENTS\.md$|^OWNERS$|^\.github/
-- as: e2e-vmaas
-  capabilities:
-  - intranet
-  skip_if_only_changed: ^.*\.(md|adoc)$|^LICENSE$|^docs/|^\.ai-bot/|^\.claude/|^\.vscode/|^\.idea/|^\.pre-commit-config.*|^\.yamllint\.yaml$|^\.golangci\.yml$|^\.copr/|^\.goreleaser\.yaml$|^\.dockerignore$|^\.gitattributes$|^\.gitignore$|^\.gitleaks\.toml$|^pyproject\.toml$|^\.python-version$|^uv\.lock$|^buf\.|^CLAUDE\.md$|^AGENTS\.md$|^OWNERS$|^\.github/
-  steps:
-    dependencies:
-      COMPONENT_IMAGE: fulfillment-service
-      OSAC_INSTALLER_IMAGE: osac-installer-with-pr
-      OSAC_TEST_IMAGE: osac-test-infra
-    env:
-      COMPONENT_IMAGE_NAME: ghcr.io/osac-project/fulfillment-service
-    workflow: osac-project-cluster-tool-vmaas
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: fulfillment-service
diff --git a/ci-operator/config/osac-project/osac-aap/OWNERS b/ci-operator/config/osac-project/osac-aap/OWNERS
deleted file mode 100644
index 606507958e588..0000000000000
--- a/ci-operator/config/osac-project/osac-aap/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-aap root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml b/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml
deleted file mode 100644
index 0d0fe2ef1e158..0000000000000
--- a/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-base_images:
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  origin-cli:
-    name: "4.20"
-    namespace: ocp
-    tag: cli
-  osac-installer:
-    name: latest
-    namespace: osac-project
-    tag: osac-installer
-  osac-test-infra:
-    name: latest
-    namespace: osac-project
-    tag: osac-test-infra
-binary_build_commands: git rev-parse HEAD^2 > /tmp/source-sha 2>/dev/null || git rev-parse
-  HEAD > /tmp/source-sha
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.25-openshift-4.21
-images:
-  items:
-  - dockerfile_literal: |
-      FROM src
-    from: src
-    to: osac-aap
-  - dockerfile_literal: |
-      FROM quay.io/centos/centos:stream9
-      RUN dnf install -y python3.12 python3.12-pip python3.12-devel \
-          systemd-libs systemd-devel gcc git-core bind-utils krb5-devel \
-          && dnf clean all
-      COPY execution-environment/requirements.txt /tmp/requirements.txt
-      RUN python3.12 -m pip install --no-cache-dir -r /tmp/requirements.txt
-      COPY collections/ /usr/share/ansible/collections/
-      COPY vendor/ /usr/share/ansible/collections/
-      COPY oc /usr/local/bin/oc
-      RUN ln -s /usr/local/bin/oc /usr/local/bin/kubectl
-    from: src
-    inputs:
-      origin-cli:
-        paths:
-        - destination_dir: .
-          source_path: /usr/bin/oc
-    to: osac-aap-ee
-  - dockerfile_literal: |
-      FROM osac-installer
-      COPY config/ /installer/base/osac-aap/config/
-      COPY source-sha /installer/.aap-source-sha
-    inputs:
-      bin:
-        paths:
-        - destination_dir: .
-          source_path: /tmp/source-sha
-      osac-installer:
-        as:
-        - osac-installer
-    to: osac-installer-with-pr
-promotion:
-  to:
-  - excluded_images:
-    - osac-installer-with-pr
-    name: latest
-    namespace: osac-project
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: e2e-vmaas
-  capabilities:
-  - intranet
-  skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|samples/.*|charts/.*|\.claude/.*|\.github/.*|\.ansible-lint.*|\.pre-commit-config.*|\.yamllint\.yaml|\.gitignore|pyproject\.toml|\.python-version|uv\.lock|OWNERS|LICENSE)$
-  steps:
-    dependencies:
-      COMPONENT_IMAGE: osac-aap-ee
-      OSAC_INSTALLER_IMAGE: osac-installer-with-pr
-      OSAC_TEST_IMAGE: osac-test-infra
-    env:
-      COMPONENT_IMAGE_NAME: osac-aap
-    workflow: osac-project-cluster-tool-vmaas
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: osac-aap
diff --git a/ci-operator/config/osac-project/osac-installer/OWNERS b/ci-operator/config/osac-project/osac-installer/OWNERS
deleted file mode 100644
index d56ac6d3c4236..0000000000000
--- a/ci-operator/config/osac-project/osac-installer/OWNERS
+++ /dev/null
@@ -1,31 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-installer root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml b/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml
deleted file mode 100644
index cd3ce748992d4..0000000000000
--- a/ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-base_images:
-  assisted-image-service:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-image-service
-  assisted-installer:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer
-  assisted-installer-agent:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer-agent
-  assisted-installer-controller:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer-controller
-  assisted-service:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-service
-  assisted-test-infra:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-test-infra
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  origin-cli:
-    name: "4.20"
-    namespace: ocp
-    tag: cli
-  osac-test-infra:
-    name: latest
-    namespace: osac-project
-    tag: osac-test-infra
-binary_build_commands: |
-  git submodule update --init base/osac-fulfillment-service
-  cd base/osac-fulfillment-service && GOFLAGS="-mod=readonly" go build -o /tmp/osac ./cmd/osac
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.26-openshift-5.0
-images:
-  items:
-  - dockerfile_literal: |
-      FROM src
-
-      ADD . /installer
-      WORKDIR /installer
-
-      RUN dnf install -y git jq && \
-          curl -fsSL https://get.helm.sh/helm-v3.17.3-linux-amd64.tar.gz | tar xz -C /tmp && \
-          mv /tmp/linux-amd64/helm /usr/local/bin/helm && \
-          curl -fsSL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.6.0/kustomize_v5.6.0_linux_amd64.tar.gz | tar xz -C /usr/local/bin
-      RUN git submodule update --init --recursive
-
-      RUN cp oc /usr/local/bin/oc
-      RUN cp osac /usr/local/bin/osac
-    from: src
-    inputs:
-      bin:
-        paths:
-        - destination_dir: .
-          source_path: /tmp/osac
-      origin-cli:
-        paths:
-        - destination_dir: .
-          source_path: /usr/bin/oc
-    to: osac-installer
-  - dockerfile_literal: FROM scratch
-    to: component-image
-promotion:
-  to:
-  - excluded_images:
-    - component-image
-    name: latest
-    namespace: osac-project
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: e2e-vmaas
-  capabilities:
-  - intranet
-  run_if_changed: ^(base/|overlays/|scripts/|prerequisites/|charts/|values/)
-  steps:
-    dependencies:
-      OSAC_INSTALLER_IMAGE: osac-installer
-      OSAC_TEST_IMAGE: osac-test-infra
-    workflow: osac-project-cluster-tool-vmaas
-- always_run: false
-  as: e2e-vmaas-full-setup-helm
-  capabilities:
-  - intranet
-  optional: true
-  steps:
-    cluster_profile: packet-osac
-    dependencies:
-      OSAC_INSTALLER_IMAGE: osac-installer
-    env:
-      ASSISTED_CONFIG: |
-        OLM_OPERATORS=cnv,lvm
-        NUM_MASTERS=1
-        NUM_WORKERS=0
-        MASTER_MEMORY=57344
-        MASTER_DISK_COUNT=2
-        MASTER_DISK=200000000000
-        MASTER_CPU=24
-        OPENSHIFT_VERSION=4.20
-      DEPLOY_MODE: helm
-      NOTIFY_LABEL: Full Setup vmaas (helm)
-      VALUES_FILE: values/vmaas-ci/values.yaml
-    workflow: osac-project-ofcir-baremetal
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: osac-installer
diff --git a/ci-operator/config/osac-project/osac-operator/OWNERS b/ci-operator/config/osac-project/osac-operator/OWNERS
deleted file mode 100644
index dd5e7a801b8c4..0000000000000
--- a/ci-operator/config/osac-project/osac-operator/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-operator root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml b/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml
deleted file mode 100644
index c268ff7cfae5f..0000000000000
--- a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-base_images:
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  osac-installer:
-    name: latest
-    namespace: osac-project
-    tag: osac-installer
-  osac-test-infra:
-    name: latest
-    namespace: osac-project
-    tag: osac-test-infra
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.21
-images:
-  items:
-  - dockerfile_path: Containerfile
-    to: osac-operator
-  - dockerfile_literal: |
-      FROM src
-    from: src
-    to: osac-operator-code
-  - dockerfile_literal: |
-      FROM osac-installer
-      COPY config/ /installer/base/osac-operator/config/
-      COPY charts/ /installer/base/osac-operator/charts/
-    inputs:
-      osac-installer:
-        as:
-        - osac-installer
-    to: osac-installer-with-pr
-promotion:
-  to:
-  - excluded_images:
-    - osac-installer-with-pr
-    name: latest
-    namespace: osac-project
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: e2e-vmaas
-  capabilities:
-  - intranet
-  skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|\.ai-bot/.*|\.claude/.*|\.vscode/.*|\.idea/.*|\.github/.*|\.golangci\.yml|\.yamllint\.yaml|\.pre-commit-config.*\.yaml|\.dockerignore|\.gitattributes|\.gitignore|buf\.|OWNERS|LICENSE|bin/.*)$
-  steps:
-    dependencies:
-      COMPONENT_IMAGE: osac-operator
-      OSAC_INSTALLER_IMAGE: osac-installer-with-pr
-      OSAC_TEST_IMAGE: osac-test-infra
-    env:
-      COMPONENT_IMAGE_NAME: ghcr.io/osac-project/osac-operator
-    workflow: osac-project-cluster-tool-vmaas
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: osac-operator
diff --git a/ci-operator/config/osac-project/osac-test-infra/OWNERS b/ci-operator/config/osac-project/osac-test-infra/OWNERS
deleted file mode 100644
index f958f8bb36abc..0000000000000
--- a/ci-operator/config/osac-project/osac-test-infra/OWNERS
+++ /dev/null
@@ -1,31 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-test-infra root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml b/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml
deleted file mode 100644
index 17ba3dd9018d1..0000000000000
--- a/ci-operator/config/osac-project/osac-test-infra/osac-project-osac-test-infra-main.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-base_images:
-  assisted-image-service:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-image-service
-  assisted-installer:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer
-  assisted-installer-agent:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer-agent
-  assisted-installer-controller:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-installer-controller
-  assisted-service:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-service
-  assisted-test-infra:
-    name: backplane-5.0
-    namespace: edge-infrastructure
-    tag: assisted-test-infra
-  dev-scripts:
-    name: test
-    namespace: ocp-kni
-    tag: dev-scripts
-  osac-installer:
-    name: latest
-    namespace: osac-project
-    tag: osac-installer
-build_root:
-  image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.21
-images:
-  items:
-  - dockerfile_path: Containerfile
-    to: osac-test-infra
-  - dockerfile_literal: FROM scratch
-    to: component-image
-promotion:
-  to:
-  - excluded_images:
-    - component-image
-    name: latest
-    namespace: osac-project
-releases:
-  latest:
-    candidate:
-      product: ocp
-      stream: nightly
-      version: "4.20"
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-tests:
-- as: e2e-vmaas
-  capabilities:
-  - intranet
-  skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|\.ai-bot/.*|\.claude/.*|\.ansible-lint|\.github/.*|\.golangci\.yml|\.yamllint\.yaml|\.pre-commit-config.*\.yaml|\.dockerignore|\.gitattributes|\.gitignore|pyproject\.toml|uv\.lock|OWNERS|LICENSE|bin/.*)$
-  steps:
-    workflow: osac-project-cluster-tool-vmaas
-- as: e2e-vmaas-periodic
-  capabilities:
-  - intranet
-  cron: 7 * * * *
-  steps:
-    workflow: osac-project-cluster-tool-vmaas
-- as: e2e-vmaas-full-setup-helm
-  capabilities:
-  - intranet
-  cron: 0 */4 * * *
-  steps:
-    cluster_profile: packet-osac
-    env:
-      ASSISTED_CONFIG: |
-        OLM_OPERATORS=cnv,lvm
-        NUM_MASTERS=1
-        NUM_WORKERS=0
-        MASTER_MEMORY=57344
-        MASTER_DISK_COUNT=2
-        MASTER_DISK=200000000000
-        MASTER_CPU=24
-        OPENSHIFT_VERSION=4.20
-      DEPLOY_MODE: helm
-      NOTIFY_LABEL: Full Setup vmaas (helm)
-    workflow: osac-project-ofcir-baremetal
-zz_generated_metadata:
-  branch: main
-  org: osac-project
-  repo: osac-test-infra
diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS
deleted file mode 100644
index 5e1b9317dc2c8..0000000000000
--- a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/OWNERS
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/bare-metal-fulfillment-operator root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-approvers:
-- adriengentil
-- carbonin
-- larsks
-options: {}
-reviewers:
-- adriengentil
-- carbonin
-- larsks
diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml
deleted file mode 100644
index 597e1e554cdca..0000000000000
--- a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-postsubmits:
-  osac-project/bare-metal-fulfillment-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build02
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-bare-metal-fulfillment-operator-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml b/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml
deleted file mode 100644
index 96b3c73116fd9..0000000000000
--- a/ci-operator/jobs/osac-project/bare-metal-fulfillment-operator/osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-presubmits:
-  osac-project/bare-metal-fulfillment-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-bare-metal-fulfillment-operator-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
diff --git a/ci-operator/jobs/osac-project/fulfillment-service/OWNERS b/ci-operator/jobs/osac-project/fulfillment-service/OWNERS
deleted file mode 100644
index eecc191dc9e59..0000000000000
--- a/ci-operator/jobs/osac-project/fulfillment-service/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/fulfillment-service root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-postsubmits.yaml b/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-postsubmits.yaml
deleted file mode 100644
index 9f7f982954f6f..0000000000000
--- a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-postsubmits.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-postsubmits:
-  osac-project/fulfillment-service:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build13
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-fulfillment-service-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml b/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml
deleted file mode 100644
index 79cc69d0f06cf..0000000000000
--- a/ci-operator/jobs/osac-project/fulfillment-service/osac-project-fulfillment-service-main-presubmits.yaml
+++ /dev/null
@@ -1,211 +0,0 @@
-presubmits:
-  osac-project/fulfillment-service:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build10
-    context: ci/prow/e2e-vmaas
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-fulfillment-service-main-e2e-vmaas
-    rerun_command: /test e2e-vmaas
-    skip_if_only_changed: ^.*\.(md|adoc)$|^LICENSE$|^docs/|^\.ai-bot/|^\.claude/|^\.vscode/|^\.idea/|^\.pre-commit-config.*|^\.yamllint\.yaml$|^\.golangci\.yml$|^\.copr/|^\.goreleaser\.yaml$|^\.dockerignore$|^\.gitattributes$|^\.gitignore$|^\.gitleaks\.toml$|^pyproject\.toml$|^\.python-version$|^uv\.lock$|^buf\.|^CLAUDE\.md$|^AGENTS\.md$|^OWNERS$|^\.github/
-    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=e2e-vmaas
-        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( | .* )e2e-vmaas,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build02
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-fulfillment-service-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build02
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-fulfillment-service-main-unit
-    rerun_command: /test unit
-    skip_if_only_changed: ^.*\.(md|adoc)$|^LICENSE$|^charts/|^it/|^docs/|^\.ai-bot/|^\.claude/|^\.vscode/|^\.idea/|^\.pre-commit-config.*|^\.yamllint\.yaml$|^\.golangci\.yml$|^\.copr/|^\.goreleaser\.yaml$|^\.dockerignore$|^\.gitattributes$|^\.gitignore$|^\.gitleaks\.toml$|^pyproject\.toml$|^\.python-version$|^uv\.lock$|^buf\.|^CLAUDE\.md$|^AGENTS\.md$|^OWNERS$|^\.github/
-    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=unit
-        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: /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( | .* )unit,?($|\s.*)
diff --git a/ci-operator/jobs/osac-project/osac-aap/OWNERS b/ci-operator/jobs/osac-project/osac-aap/OWNERS
deleted file mode 100644
index 606507958e588..0000000000000
--- a/ci-operator/jobs/osac-project/osac-aap/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-aap root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-postsubmits.yaml b/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-postsubmits.yaml
deleted file mode 100644
index c3781a57e9b64..0000000000000
--- a/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-postsubmits.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-postsubmits:
-  osac-project/osac-aap:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build02
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-osac-aap-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-presubmits.yaml
deleted file mode 100644
index f56c4f628de6f..0000000000000
--- a/ci-operator/jobs/osac-project/osac-aap/osac-project-osac-aap-main-presubmits.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-presubmits:
-  osac-project/osac-aap:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build06
-    context: ci/prow/e2e-vmaas
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-aap-main-e2e-vmaas
-    rerun_command: /test e2e-vmaas
-    skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|samples/.*|charts/.*|\.claude/.*|\.github/.*|\.ansible-lint.*|\.pre-commit-config.*|\.yamllint\.yaml|\.gitignore|pyproject\.toml|\.python-version|uv\.lock|OWNERS|LICENSE)$
-    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=e2e-vmaas
-        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( | .* )e2e-vmaas,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build06
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-aap-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
diff --git a/ci-operator/jobs/osac-project/osac-installer/OWNERS b/ci-operator/jobs/osac-project/osac-installer/OWNERS
deleted file mode 100644
index d56ac6d3c4236..0000000000000
--- a/ci-operator/jobs/osac-project/osac-installer/OWNERS
+++ /dev/null
@@ -1,31 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-installer root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-postsubmits.yaml b/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-postsubmits.yaml
deleted file mode 100644
index 30d56b94914ed..0000000000000
--- a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-postsubmits.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-postsubmits:
-  osac-project/osac-installer:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build02
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-osac-installer-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml
deleted file mode 100644
index a62f74d37fc2b..0000000000000
--- a/ci-operator/jobs/osac-project/osac-installer/osac-project-osac-installer-main-presubmits.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-presubmits:
-  osac-project/osac-installer:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build03
-    context: ci/prow/e2e-vmaas
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-installer-main-e2e-vmaas
-    rerun_command: /test e2e-vmaas
-    run_if_changed: ^(base/|overlays/|scripts/|prerequisites/|charts/|values/)
-    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=e2e-vmaas
-        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( | .* )e2e-vmaas,?($|\s.*)
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build03
-    context: ci/prow/e2e-vmaas-full-setup-helm
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-installer-main-e2e-vmaas-full-setup-helm
-    optional: true
-    rerun_command: /test e2e-vmaas-full-setup-helm
-    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=e2e-vmaas-full-setup-helm
-        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( | .* )e2e-vmaas-full-setup-helm,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build03
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-installer-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
diff --git a/ci-operator/jobs/osac-project/osac-operator/OWNERS b/ci-operator/jobs/osac-project/osac-operator/OWNERS
deleted file mode 100644
index dd5e7a801b8c4..0000000000000
--- a/ci-operator/jobs/osac-project/osac-operator/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-operator root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-postsubmits.yaml b/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-postsubmits.yaml
deleted file mode 100644
index 02641b8600b9b..0000000000000
--- a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-postsubmits.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-postsubmits:
-  osac-project/osac-operator:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build02
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-osac-operator-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml
deleted file mode 100644
index 6c1326336e38b..0000000000000
--- a/ci-operator/jobs/osac-project/osac-operator/osac-project-osac-operator-main-presubmits.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-presubmits:
-  osac-project/osac-operator:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build12
-    context: ci/prow/e2e-vmaas
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-operator-main-e2e-vmaas
-    rerun_command: /test e2e-vmaas
-    skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|\.ai-bot/.*|\.claude/.*|\.vscode/.*|\.idea/.*|\.github/.*|\.golangci\.yml|\.yamllint\.yaml|\.pre-commit-config.*\.yaml|\.dockerignore|\.gitattributes|\.gitignore|buf\.|OWNERS|LICENSE|bin/.*)$
-    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=e2e-vmaas
-        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( | .* )e2e-vmaas,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build12
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-operator-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
diff --git a/ci-operator/jobs/osac-project/osac-test-infra/OWNERS b/ci-operator/jobs/osac-project/osac-test-infra/OWNERS
deleted file mode 100644
index f958f8bb36abc..0000000000000
--- a/ci-operator/jobs/osac-project/osac-test-infra/OWNERS
+++ /dev/null
@@ -1,31 +0,0 @@
-# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
-# Fetched from https://github.com/osac-project/osac-test-infra root OWNERS
-# If the repo had OWNERS_ALIASES then the aliases were expanded
-# Logins who are not members of 'openshift' organization were filtered out
-# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
-
-filters:
-  '[^.]':
-    approvers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-    reviewers:
-    - adriengentil
-    - akshaynadkarni
-    - danmanor
-    - eliorerz
-    - eranco74
-    - jhernand
-    - larsks
-    - omer-vishlitzky
-    - rgolangh
-    - trewest
-options: {}
diff --git a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml
deleted file mode 100644
index 7daf8c578891a..0000000000000
--- a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-periodics.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-periodics:
-- agent: kubernetes
-  cluster: build03
-  cron: 0 */4 * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Containerfile
-  extra_refs:
-  - base_ref: main
-    org: osac-project
-    repo: osac-test-infra
-    sparse_checkout_files:
-    - Containerfile
-  labels:
-    capability/intranet: intranet
-    ci-operator.openshift.io/cloud: packet-edge
-    ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-    ci.openshift.io/generator: prowgen
-    job-release: "4.20"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-osac-project-osac-test-infra-main-e2e-vmaas-full-setup-helm
-  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=e2e-vmaas-full-setup-helm
-      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: build03
-  cron: 7 * * * *
-  decorate: true
-  decoration_config:
-    sparse_checkout_files:
-    - Containerfile
-  extra_refs:
-  - base_ref: main
-    org: osac-project
-    repo: osac-test-infra
-    sparse_checkout_files:
-    - Containerfile
-  labels:
-    capability/intranet: intranet
-    ci-operator.openshift.io/cloud: packet-edge
-    ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-    ci.openshift.io/generator: prowgen
-    job-release: "4.20"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-osac-project-osac-test-infra-main-e2e-vmaas-periodic
-  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=e2e-vmaas-periodic
-      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
diff --git a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-postsubmits.yaml b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-postsubmits.yaml
deleted file mode 100644
index da6d2c628ea71..0000000000000
--- a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-postsubmits.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-postsubmits:
-  osac-project/osac-test-infra:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    cluster: build12
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci-operator.openshift.io/is-promotion: "true"
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-    max_concurrency: 1
-    name: branch-ci-osac-project-osac-test-infra-main-images
-    spec:
-      containers:
-      - args:
-        - --gcs-upload-secret=/secrets/gcs/service-account.json
-        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
-        - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
-        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/push-secret
-          name: push-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: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
-      - name: result-aggregator
-        secret:
-          secretName: result-aggregator
diff --git a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml b/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml
deleted file mode 100644
index 26fa6835a1f3f..0000000000000
--- a/ci-operator/jobs/osac-project/osac-test-infra/osac-project-osac-test-infra-main-presubmits.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-presubmits:
-  osac-project/osac-test-infra:
-  - agent: kubernetes
-    always_run: false
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build05
-    context: ci/prow/e2e-vmaas
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      capability/intranet: intranet
-      ci-operator.openshift.io/cloud: packet-edge
-      ci-operator.openshift.io/cloud-cluster-profile: packet-osac
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-test-infra-main-e2e-vmaas
-    rerun_command: /test e2e-vmaas
-    skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|\.ai-bot/.*|\.claude/.*|\.ansible-lint|\.github/.*|\.golangci\.yml|\.yamllint\.yaml|\.pre-commit-config.*\.yaml|\.dockerignore|\.gitattributes|\.gitignore|pyproject\.toml|uv\.lock|OWNERS|LICENSE|bin/.*)$
-    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=e2e-vmaas
-        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( | .* )e2e-vmaas,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^main$
-    - ^main-
-    cluster: build05
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      sparse_checkout_files:
-      - Containerfile
-    labels:
-      ci.openshift.io/generator: prowgen
-      job-release: "4.20"
-      pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-osac-project-osac-test-infra-main-images
-    rerun_command: /test 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]
-        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( | .* )images,?($|\s.*)
diff --git a/ci-operator/step-registry/osac-project/OWNERS b/ci-operator/step-registry/osac-project/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/baremetal/OWNERS b/ci-operator/step-registry/osac-project/baremetal/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/baremetal/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/baremetal/test/OWNERS b/ci-operator/step-registry/osac-project/baremetal/test/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/baremetal/test/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh b/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh
deleted file mode 100644
index 7f22c95bd03cc..0000000000000
--- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-commands.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-echo "Running OSAC E2E tests: suite=${TEST_SUITE}"
-
-REMOTE_RESULTS_DIR="/tmp/test-results"
-
-function collect_artifacts() {
-    echo "Collecting test artifacts..."
-    timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \
-        "ci_machine:${REMOTE_RESULTS_DIR}/junit_${TEST_SUITE}.xml" \
-        "${ARTIFACT_DIR}/junit_${TEST_SUITE}.xml" 2>/dev/null || true
-}
-trap collect_artifacts EXIT
-
-TEST_EXIT=0
-timeout -s 9 60m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s \
-    "${TEST_SUITE}" \
-    "${E2E_NAMESPACE}" \
-    "${E2E_VM_TEMPLATE}" \
-    "${E2E_CLUSTER_TEMPLATE}" \
-    "${OSAC_TEST_IMAGE}" \
-    "${REMOTE_RESULTS_DIR}" \
-    <<'REMOTE_EOF' || TEST_EXIT=$?
-set -euo pipefail
-
-TEST_SUITE="$1"
-E2E_NAMESPACE="$2"
-E2E_VM_TEMPLATE="$3"
-E2E_CLUSTER_TEMPLATE="$4"
-OSAC_TEST_IMAGE="$5"
-RESULTS_DIR="$6"
-
-mkdir -p "${RESULTS_DIR}"
-
-KUBECONFIG=$(find ${KUBECONFIG} -type f -print -quit 2>/dev/null)
-[[ -z "${KUBECONFIG}" ]] && echo "ERROR: No kubeconfig found" && exit 1
-
-PULL_SECRET_PATH="/root/pull-secret"
-
-set +x
-podman run --authfile "${PULL_SECRET_PATH}" --rm --network=host \
-  -v "${KUBECONFIG}:/root/.kube/config:z" \
-  -v "${PULL_SECRET_PATH}:/root/pull-secret:z" \
-  -v "${RESULTS_DIR}":/tmp/test-results:z \
-  -e KUBECONFIG=/root/.kube/config \
-  -e OSAC_VM_KUBECONFIG=/root/.kube/config \
-  -e OSAC_NAMESPACE="${E2E_NAMESPACE}" \
-  -e OSAC_VM_TEMPLATE="${E2E_VM_TEMPLATE}" \
-  -e OSAC_CLUSTER_TEMPLATE="${E2E_CLUSTER_TEMPLATE}" \
-  -e OSAC_PULL_SECRET_PATH=/root/pull-secret \
-  "${OSAC_TEST_IMAGE}" \
-  pytest "tests/${TEST_SUITE}/" -v --junitxml="/tmp/test-results/junit_${TEST_SUITE}.xml"
-REMOTE_EOF
-
-if [[ "${TEST_EXIT}" -ne 0 ]]; then
-    echo "FAILED" > "${SHARED_DIR}/test-result"
-    echo "Some tests failed (exit code: ${TEST_EXIT})"
-    exit "${TEST_EXIT}"
-fi
-
-echo "PASSED" > "${SHARED_DIR}/test-result"
-echo "All tests passed."
diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json b/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json
deleted file mode 100644
index 1546c8335856e..0000000000000
--- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml b/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml
deleted file mode 100644
index 3ea72e0260fa3..0000000000000
--- a/ci-operator/step-registry/osac-project/baremetal/test/osac-project-baremetal-test-ref.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-ref:
-  as: osac-project-baremetal-test
-  from: dev-scripts
-  dependencies:
-  - name: osac-test-infra
-    env: OSAC_TEST_IMAGE
-  grace_period: 10m
-  timeout: 3h0m0s
-  commands: osac-project-baremetal-test-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  env:
-  - name: TEST_SUITE
-    default: "vmaas"
-    documentation: Test suite to run (matches tests/<suite>/ directory, e.g. vmaas or caas)
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace to use for the e2e tests
-  - name: E2E_VM_TEMPLATE
-    default: "osac.templates.ocp_virt_vm"
-    documentation: The VM template to use for the e2e tests
-  - name: E2E_CLUSTER_TEMPLATE
-    default: "osac.templates.ocp_4_17_small"
-    documentation: The cluster template to use for CaaS e2e tests
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/boot/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/boot/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh
deleted file mode 100644
index 32ecea718b60d..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-commands.sh
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-echo "************ cluster-tool boot ************"
-echo "CLUSTER_TOOL_COMMIT: ${CLUSTER_TOOL_COMMIT}"
-echo "CLUSTER_TOOL_FLAVOR_IMAGE: ${CLUSTER_TOOL_FLAVOR_IMAGE}"
-echo "E2E_NAMESPACE: ${E2E_NAMESPACE}"
-echo "E2E_VALUES_FILE: ${E2E_VALUES_FILE}"
-echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}"
-echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}"
-echo "COMPONENT_IMAGE: ${COMPONENT_IMAGE:-<none>}"
-echo "COMPONENT_IMAGE_NAME: ${COMPONENT_IMAGE_NAME:-<none>}"
-echo "-------------------------------------------"
-
-CLONE_NAME="vmaas-helm"
-
-# === Create ssh_config from ofcir-acquire output ===
-IP=$(cat "${SHARED_DIR}/server-ip")
-PORT=22
-if [[ -f "${SHARED_DIR}/server-sshport" ]]; then
-    PORT=$(<"${SHARED_DIR}/server-sshport")
-fi
-
-cat > "${SHARED_DIR}/ssh_config" <<SSHEOF
-Host ci_machine
-    HostName ${IP}
-    User root
-    Port ${PORT}
-    StrictHostKeyChecking no
-    UserKnownHostsFile /dev/null
-    ServerAliveInterval 90
-    LogLevel ERROR
-    IdentityFile ${CLUSTER_PROFILE_DIR}/packet-ssh-key
-SSHEOF
-
-echo "SSH config created for ${IP}:${PORT}"
-
-# === Wait for SSH ===
-echo "Waiting for SSH to be ready..."
-for i in $(seq 30); do
-    ssh -F "${SHARED_DIR}/ssh_config" ci_machine hostname 2>/dev/null && break
-    echo "  attempt ${i}/30 - retrying in 10s..."
-    sleep 10
-done
-ssh -F "${SHARED_DIR}/ssh_config" ci_machine hostname 2>/dev/null || {
-    echo "ERROR: SSH to ${IP}:${PORT} never became available after 30 attempts"
-    exit 1
-}
-
-# === Build merged pull-secret with CI registry credentials ===
-# The old workflow gets CI registry auth via dev-scripts setup; cluster-tool
-# skips that. Download oc and use oc registry login (the standard CI pattern).
-echo "Building pull secret..."
-echo "  Cluster profile registries: $(jq -r '.auths | keys | join(", ")' ${CLUSTER_PROFILE_DIR}/pull-secret 2>/dev/null || echo 'PARSE ERROR')"
-
-echo "  Downloading oc client..."
-curl -fsSL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz \
-    | tar xzf - -C /tmp oc
-echo "  Getting CI registry credentials via oc registry login..."
-KUBECONFIG="" /tmp/oc registry login --to=/tmp/ci-pull-creds.json
-echo "  CI registry creds: $(jq -r '.auths | keys | join(", ")' /tmp/ci-pull-creds.json 2>/dev/null || echo 'PARSE ERROR')"
-
-jq -s 'reduce .[] as $x ({}; . * $x)' \
-    "${CLUSTER_PROFILE_DIR}/pull-secret" \
-    /tmp/ci-pull-creds.json \
-    > /tmp/merged-pull-secret.json
-echo "  Merged registries: $(jq -r '.auths | keys | join(", ")' /tmp/merged-pull-secret.json 2>/dev/null || echo 'PARSE ERROR')"
-
-echo "Copying pull secret to machine..."
-timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \
-    /tmp/merged-pull-secret.json \
-    ci_machine:/root/pull-secret
-
-echo "Copying AAP license to machine..."
-base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip
-timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \
-    /tmp/license.zip \
-    ci_machine:/tmp/license.zip
-
-# === Determine fork repo URL for AAP project sync ===
-AAP_SOURCE_REPO_URL=""
-if [[ -n "${PULL_NUMBER:-}" ]] && [[ "${REPO_NAME:-}" == "osac-aap" ]]; then
-    PR_AUTHOR=$(echo "${JOB_SPEC}" | jq -r '.refs.pulls[0].author // empty' 2>/dev/null || true)
-    if [[ -n "${PR_AUTHOR}" ]] && [[ "${PR_AUTHOR}" != "${REPO_OWNER:-}" ]]; then
-        CANDIDATE_URL="https://github.com/${PR_AUTHOR}/${REPO_NAME}"
-        if curl -sfI "${CANDIDATE_URL}" &>/dev/null; then
-            AAP_SOURCE_REPO_URL="${CANDIDATE_URL}.git"
-            echo "Fork PR detected, AAP source repo: ${AAP_SOURCE_REPO_URL}"
-        fi
-    fi
-fi
-
-# === Write boot script to machine and execute ===
-echo "Creating boot script on machine..."
-timeout -s 9 1m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -c 'cat > /root/boot.sh' <<'REMOTE_SCRIPT'
-set -euo pipefail
-
-COMMIT="$1"
-FLAVOR_IMAGE="$2"
-CLONE="$3"
-INSTALLER_IMAGE="$4"
-VALUES_FILE="$5"
-VM_TEMPLATE="$6"
-COMPONENT_IMAGE="${7:-}"
-COMPONENT_IMAGE_NAME="${8:-}"
-NAMESPACE="${9:-osac-e2e-ci}"
-AAP_SOURCE_REPO_URL="${10:-}"
-
-VALUES_DIR=$(dirname "${VALUES_FILE}")
-
-_timer() {
-    local elapsed=$(( $(date +%s) - $1 ))
-    printf "[TIMING] %s: %dm %ds\n" "$2" $((elapsed/60)) $((elapsed%60))
-}
-
-BOOT_TOTAL_START=$(date +%s)
-
-# --- Phase 1: cluster-tool setup ---
-SETUP_START=$(date +%s)
-echo "=== Downloading cluster-tool ==="
-curl -fsSL "https://raw.githubusercontent.com/omer-vishlitzky/cluster-tool/${COMMIT}/cluster-tool" \
-    -o /usr/local/bin/cluster-tool
-chmod +x /usr/local/bin/cluster-tool
-
-echo "=== Setting up DNS (standalone dnsmasq) ==="
-ORIG_DNS=$(grep nameserver /etc/resolv.conf 2>/dev/null | awk '{print $2}' | head -1)
-ORIG_DNS=${ORIG_DNS:-8.8.8.8}
-
-dnf install -y dnsmasq jq
-mkdir -p /etc/NetworkManager/dnsmasq.d /etc/dnsmasq.d /etc/NetworkManager/conf.d
-
-systemctl stop systemd-resolved 2>/dev/null || true
-systemctl disable systemd-resolved 2>/dev/null || true
-
-echo -e '[main]\ndns=none' > /etc/NetworkManager/conf.d/cluster-tool-dns.conf
-systemctl restart NetworkManager
-
-cat > /etc/dnsmasq.d/cluster-tool.conf <<DNSEOF
-listen-address=127.0.0.1
-bind-interfaces
-server=${ORIG_DNS}
-conf-dir=/etc/NetworkManager/dnsmasq.d
-DNSEOF
-
-systemctl enable --now dnsmasq
-echo "nameserver 127.0.0.1" > /etc/resolv.conf
-echo "DNS ready (standalone dnsmasq, upstream=${ORIG_DNS})"
-
-echo "=== Setting up server ==="
-python3 /usr/local/bin/cluster-tool connect ci --host local --data-path /home/cluster-tool
-_timer $SETUP_START "Setup (cluster-tool + DNS + server)"
-
-# --- Phase 2: pull + boot ---
-echo "=== Setting up container auth ==="
-mkdir -p /root/.config/containers
-cp /root/pull-secret /root/.config/containers/auth.json
-
-PULL_START=$(date +%s)
-echo "=== Pulling OSAC vmaas flavor ==="
-python3 /usr/local/bin/cluster-tool pull "${FLAVOR_IMAGE}"
-_timer $PULL_START "Pull flavor"
-
-CLUSTER_BOOT_START=$(date +%s)
-echo "=== Booting cluster ==="
-python3 /usr/local/bin/cluster-tool boot --flavor vmaas-helm --name "${CLONE}"
-_timer $CLUSTER_BOOT_START "Boot cluster"
-
-systemctl restart dnsmasq
-
-# --- Phase 3: configure access ---
-KUBECONFIG_PATH="/root/.kube/${CLONE}.kubeconfig"
-echo "export KUBECONFIG=${KUBECONFIG_PATH}" >> /root/.bashrc
-export KUBECONFIG="${KUBECONFIG_PATH}"
-
-echo "=== Installing oc ==="
-curl -fsSL https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz \
-    | tar xzf - -C /usr/local/bin oc kubectl
-
-echo "=== Installing osac from installer image ==="
-podman run --authfile /root/pull-secret --rm \
-    -v /usr/local/bin:/target:z \
-    "${INSTALLER_IMAGE}" \
-    cp /usr/local/bin/osac /target/osac
-
-echo "=== Updating cluster pull secret ==="
-oc set data secret/pull-secret -n openshift-config \
-    --from-file=.dockerconfigjson=/root/pull-secret
-
-# --- Phase 4: component override (conditional) ---
-COMPONENT_OVERRIDE_CMD=""
-if [[ -n "${COMPONENT_IMAGE}" ]] && [[ -n "${COMPONENT_IMAGE_NAME}" ]]; then
-    echo "=== Component override: ${COMPONENT_IMAGE_NAME} → ${COMPONENT_IMAGE} ==="
-    COMPONENT_TAG="${COMPONENT_IMAGE##*:}"
-    COMPONENT_REPO="${COMPONENT_IMAGE%:*}"
-    VF="/installer/${VALUES_FILE}"
-    # Replace full image:tag references — match entire registry/path to handle short names (e.g. osac-aap)
-    COMPONENT_OVERRIDE_CMD="sed -i 's|[a-zA-Z0-9./_-]*${COMPONENT_IMAGE_NAME}:[a-zA-Z0-9._-]*|${COMPONENT_IMAGE}|g' ${VF} && "
-    # Replace split repository/tag format (e.g. operator.image.repository + operator.image.tag)
-    COMPONENT_OVERRIDE_CMD="${COMPONENT_OVERRIDE_CMD}sed -i '/repository: .*${COMPONENT_IMAGE_NAME##*/}/{s|repository: .*|repository: ${COMPONENT_REPO}|;n;s/tag: .*/tag: ${COMPONENT_TAG}/}' ${VF} && "
-    # Verify the override landed
-    COMPONENT_OVERRIDE_CMD="${COMPONENT_OVERRIDE_CMD}grep -q '${COMPONENT_TAG}' ${VF} || { echo 'ERROR: component image override not found in values file'; exit 1; } && "
-fi
-
-# When testing an osac-aap PR, the installer-with-pr image contains
-# .aap-source-sha with the PR's head commit SHA. Override both
-# AAP_PROJECT_GIT_BRANCH (playbook sync) and AAP_EE_IMAGE (execution
-# environment) so AAP uses the PR's code instead of the pinned versions.
-AAP_OVERRIDE_CMD=""
-AAP_SOURCE_SHA=$(podman run --authfile /root/pull-secret --rm "${INSTALLER_IMAGE}" cat /installer/.aap-source-sha 2>/dev/null || true)
-if [[ -n "${AAP_SOURCE_SHA}" ]]; then
-    echo "=== AAP project git ref override: ${AAP_SOURCE_SHA} ==="
-    VF="/installer/${VALUES_FILE}"
-    AAP_OVERRIDE_CMD="sed -i 's|projectGitBranch: .*|projectGitBranch: \"${AAP_SOURCE_SHA}\"|' ${VF} && grep -q '${AAP_SOURCE_SHA}' ${VF} || { echo 'ERROR: projectGitBranch override failed'; exit 1; } && "
-    if [[ -n "${AAP_SOURCE_REPO_URL}" ]]; then
-        echo "=== AAP project git URI override: ${AAP_SOURCE_REPO_URL} ==="
-        AAP_OVERRIDE_CMD="${AAP_OVERRIDE_CMD}sed -i 's|projectGitUri: .*|projectGitUri: \"${AAP_SOURCE_REPO_URL}\"|' ${VF} && grep -q '${AAP_SOURCE_REPO_URL}' ${VF} || { echo 'ERROR: projectGitUri override failed'; exit 1; } && "
-    fi
-    if [[ -n "${COMPONENT_IMAGE}" ]]; then
-        echo "=== AAP EE image override: ${COMPONENT_IMAGE} ==="
-        AAP_OVERRIDE_CMD="${AAP_OVERRIDE_CMD}sed -i 's|eeImage: .*|eeImage: \"${COMPONENT_IMAGE}\"|' ${VF} && grep -q 'eeImage:.*${COMPONENT_IMAGE}' ${VF} || { echo 'ERROR: eeImage override failed'; exit 1; } && "
-    fi
-fi
-
-# --- Phase 5: refresh ---
-REFRESH_START=$(date +%s)
-echo "=== Running refresh ==="
-podman run --authfile /root/pull-secret --rm --network=host \
-    -v "${KUBECONFIG_PATH}":/root/.kube/config:z \
-    -v /tmp/license.zip:/installer/${VALUES_DIR}/license.zip:z \
-    -v /root/pull-secret:/installer/${VALUES_DIR}/pull-secret.json:z \
-    -e KUBECONFIG=/root/.kube/config \
-    -e VALUES_FILE="${VALUES_FILE}" \
-    -e INSTALLER_VM_TEMPLATE="${VM_TEMPLATE}" \
-    -e INSTALLER_NAMESPACE="${NAMESPACE}" \
-    "${INSTALLER_IMAGE}" \
-    bash -c "${COMPONENT_OVERRIDE_CMD}${AAP_OVERRIDE_CMD}cd /installer && python3 -u scripts/refresh-after-snapshot.py"
-_timer $REFRESH_START "Refresh"
-
-echo ""
-echo "=== Boot + refresh complete ==="
-_timer $BOOT_TOTAL_START "Total (setup + pull + boot + refresh)"
-REMOTE_SCRIPT
-
-echo "Executing boot script on machine..."
-timeout -s 9 50m ssh -F "${SHARED_DIR}/ssh_config" ci_machine \
-    "bash /root/boot.sh \
-    '${CLUSTER_TOOL_COMMIT}' \
-    '${CLUSTER_TOOL_FLAVOR_IMAGE}' \
-    '${CLONE_NAME}' \
-    '${OSAC_INSTALLER_IMAGE}' \
-    '${E2E_VALUES_FILE}' \
-    '${E2E_VM_TEMPLATE}' \
-    '${COMPONENT_IMAGE:-}' \
-    '${COMPONENT_IMAGE_NAME:-}' \
-    '${E2E_NAMESPACE}' \
-    '${AAP_SOURCE_REPO_URL:-}'"
-
-echo "Boot step finished successfully."
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json
deleted file mode 100644
index 9d7bb3600ddf3..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml
deleted file mode 100644
index 4a1878d720772..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/boot/osac-project-cluster-tool-boot-ref.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-ref:
-  as: osac-project-cluster-tool-boot
-  from: dev-scripts
-  dependencies:
-  - name: osac-installer
-    env: OSAC_INSTALLER_IMAGE
-  - name: component-image
-    env: COMPONENT_IMAGE
-  grace_period: 10m
-  timeout: 1h0m0s
-  commands: osac-project-cluster-tool-boot-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  credentials:
-  - namespace: test-credentials
-    name: osac-installer-aap
-    mount_path: /var/run/osac-installer-aap
-  env:
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace to use for OSAC deployment
-  - name: E2E_VALUES_FILE
-    default: "values/vmaas-ci/values.yaml"
-    documentation: Helm values file path (relative to installer root)
-  - name: E2E_VM_TEMPLATE
-    default: "osac.templates.ocp_virt_vm"
-    documentation: The VM template to publish
-  - name: COMPONENT_IMAGE_NAME
-    default: ""
-    documentation: Image name to override (e.g. ghcr.io/osac-project/fulfillment-service)
-  - name: CLUSTER_TOOL_COMMIT
-    default: "main"
-    documentation: cluster-tool git ref to download (branch, tag, or commit)
-  - name: CLUSTER_TOOL_FLAVOR_IMAGE
-    default: "quay.io/rh-ee-ovishlit/cluster-flavors:vmaas-helm"
-    documentation: OCI image containing the OSAC snapshot flavor
-  documentation: |-
-    Boots an OSAC cluster from a pre-built snapshot using cluster-tool,
-    then refreshes domain-sensitive resources via helm upgrade.
-    Optionally overrides a component image for PR testing.
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/destroy/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/destroy/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh
deleted file mode 100644
index 8761c532666f5..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-commands.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o pipefail
-
-echo "************ cluster-tool destroy ************"
-
-CLONE_NAME="vmaas-helm"
-
-timeout -s 9 5m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s "${CLONE_NAME}" <<'REMOTE_EOF' || true
-set -o pipefail
-CLONE="$1"
-
-if command -v cluster-tool &>/dev/null || [[ -f /usr/local/bin/cluster-tool ]]; then
-    echo "Destroying clone ${CLONE}..."
-    python3 /usr/local/bin/cluster-tool destroy "${CLONE}" 2>&1 || true
-else
-    echo "cluster-tool not found, skipping cleanup"
-fi
-REMOTE_EOF
-
-echo "Destroy step finished."
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json
deleted file mode 100644
index b192e56254ce7..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml
deleted file mode 100644
index ffd65c9a014b3..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/destroy/osac-project-cluster-tool-destroy-ref.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-ref:
-  as: osac-project-cluster-tool-destroy
-  from: dev-scripts
-  best_effort: true
-  grace_period: 5m
-  timeout: 10m0s
-  commands: osac-project-cluster-tool-destroy-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  documentation: |-
-    Best-effort cleanup of a cluster-tool clone. Runs in post steps.
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/test/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/test/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/test/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh
deleted file mode 100644
index b454e5f3095b2..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-commands.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-echo "************ cluster-tool vmaas test ************"
-echo "Running ALL vmaas tests sequentially"
-echo "OSAC_TEST_IMAGE: ${OSAC_TEST_IMAGE}"
-echo "E2E_NAMESPACE: ${E2E_NAMESPACE}"
-echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}"
-echo "-------------------------------------------"
-
-CLONE_NAME="vmaas-helm"
-KUBECONFIG_PATH="/root/.kube/${CLONE_NAME}.kubeconfig"
-REMOTE_RESULTS_DIR="/tmp/test-results"
-
-function collect_artifacts() {
-    echo "Collecting test artifacts..."
-    timeout -s 9 2m scp -F "${SHARED_DIR}/ssh_config" \
-        "ci_machine:${REMOTE_RESULTS_DIR}/junit_vmaas.xml" \
-        "${ARTIFACT_DIR}/junit_vmaas.xml" 2>/dev/null || true
-}
-trap collect_artifacts EXIT
-
-TEST_EXIT=0
-timeout -s 9 60m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s \
-    "${E2E_NAMESPACE}" \
-    "${E2E_VM_TEMPLATE}" \
-    "${E2E_CLUSTER_TEMPLATE}" \
-    "${OSAC_TEST_IMAGE}" \
-    "${KUBECONFIG_PATH}" \
-    "${REMOTE_RESULTS_DIR}" \
-    <<'REMOTE_EOF' || TEST_EXIT=$?
-set -euo pipefail
-
-NAMESPACE="$1"
-VM_TEMPLATE="$2"
-CLUSTER_TEMPLATE="$3"
-TEST_IMAGE="$4"
-KUBECONFIG_PATH="$5"
-RESULTS_DIR="$6"
-
-mkdir -p "${RESULTS_DIR}"
-
-export KUBECONFIG="${KUBECONFIG_PATH}"
-echo "Waiting for KubeVirt to be Available..."
-for attempt in $(seq 1 60); do
-    AVAILABLE=$(oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o jsonpath='{.status.conditions[?(@.type=="Available")].status}' 2>/dev/null || echo "Unknown")
-    if [[ "${AVAILABLE}" == "True" ]]; then
-        echo "  KubeVirt Available after $((attempt * 10))s"
-        break
-    fi
-    if [[ $((attempt % 6)) -eq 0 ]]; then
-        PROGRESSING=$(oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o jsonpath='{.status.conditions[?(@.type=="Progressing")].message}' 2>/dev/null || echo "unknown")
-        echo "  [${attempt}0s] KubeVirt not Available yet: ${PROGRESSING}"
-    fi
-    sleep 10
-done
-if [[ "${AVAILABLE}" != "True" ]]; then
-    echo "ERROR: KubeVirt not Available after 600s"
-    oc get hyperconverged kubevirt-hyperconverged -n openshift-cnv -o yaml 2>/dev/null || true
-    exit 1
-fi
-unset KUBECONFIG
-
-echo "Running vmaas tests..."
-podman run --authfile /root/pull-secret --rm --network=host \
-    -v "${KUBECONFIG_PATH}":/root/.kube/config:z \
-    -v /root/pull-secret:/root/pull-secret:z \
-    -v "${RESULTS_DIR}":/tmp/test-results:z \
-    -e KUBECONFIG=/root/.kube/config \
-    -e OSAC_VM_KUBECONFIG=/root/.kube/config \
-    -e OSAC_NAMESPACE="${NAMESPACE}" \
-    -e OSAC_VM_TEMPLATE="${VM_TEMPLATE}" \
-    -e OSAC_CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE}" \
-    -e OSAC_PULL_SECRET_PATH=/root/pull-secret \
-    "${TEST_IMAGE}" \
-    pytest tests/vmaas/ -v --junitxml=/tmp/test-results/junit_vmaas.xml
-
-echo "Tests completed."
-REMOTE_EOF
-
-if [[ "${TEST_EXIT}" -ne 0 ]]; then
-    echo "FAILED" > "${SHARED_DIR}/test-result"
-    echo "Some tests failed (exit code: ${TEST_EXIT})"
-    exit "${TEST_EXIT}"
-fi
-
-echo "PASSED" > "${SHARED_DIR}/test-result"
-echo "All tests passed."
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json
deleted file mode 100644
index b2a8c447fad44..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml b/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml
deleted file mode 100644
index ada6fd6ca5d5d..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/test/osac-project-cluster-tool-test-ref.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-ref:
-  as: osac-project-cluster-tool-test
-  from: dev-scripts
-  dependencies:
-  - name: osac-test-infra
-    env: OSAC_TEST_IMAGE
-  grace_period: 10m
-  timeout: 1h30m0s
-  commands: osac-project-cluster-tool-test-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  env:
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace to use for the e2e tests
-  - name: E2E_VM_TEMPLATE
-    default: "osac.templates.ocp_virt_vm"
-    documentation: The VM template to use for vmaas tests
-  - name: E2E_CLUSTER_TEMPLATE
-    default: "osac.templates.ocp_4_17_small"
-    documentation: The cluster template to use for CaaS tests
-  documentation: |-
-    Runs all vmaas e2e tests sequentially on a cluster-tool booted cluster.
-    Produces JUnit XML for per-test reporting in Prow.
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/OWNERS b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json
deleted file mode 100644
index 8ed75b73acb2a..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml b/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml
deleted file mode 100644
index 55062cda17e9c..0000000000000
--- a/ci-operator/step-registry/osac-project/cluster-tool/vmaas/osac-project-cluster-tool-vmaas-workflow.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-workflow:
-  as: osac-project-cluster-tool-vmaas
-  steps:
-    cluster_profile: packet-osac
-    allow_best_effort_post_steps: true
-    allow_skip_on_success: true
-    pre:
-      - ref: ofcir-acquire
-      - ref: baremetalds-devscripts-ibm
-      - ref: osac-project-cluster-tool-boot
-    test:
-      - ref: osac-project-cluster-tool-test
-    post:
-      - ref: osac-project-notify
-      - ref: osac-project-gather
-      - ref: osac-project-cluster-tool-destroy
-      - ref: ofcir-gather
-      - ref: ofcir-release
-    env:
-      CLUSTERTYPE: "osac"
-      NOTIFY_LABEL: "E2E vmaas"
-  documentation: |-
-    Boots an OSAC cluster from a pre-built snapshot via cluster-tool,
-    runs the refresh script to fix domain-sensitive resources, then
-    executes all vmaas e2e tests on the single cluster.
-    Replaces the per-test osac-project-ofcir-baremetal workflow.
diff --git a/ci-operator/step-registry/osac-project/gather/OWNERS b/ci-operator/step-registry/osac-project/gather/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/gather/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh b/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh
deleted file mode 100644
index ebdfc4b1bc07b..0000000000000
--- a/ci-operator/step-registry/osac-project/gather/osac-project-gather-commands.sh
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o pipefail
-
-echo "************ osac-project-gather: collecting OSAC pod logs ************"
-
-REMOTE_ARTIFACT_DIR="/tmp/osac-artifacts"
-
-timeout -s 9 10m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash -s "${E2E_NAMESPACE}" "${REMOTE_ARTIFACT_DIR}" <<'REMOTE_EOF'
-set -o nounset
-set -o pipefail
-
-E2E_NAMESPACE="$1"
-ARTIFACT_DIR="$2"
-
-KUBECONFIG=$(find ${KUBECONFIG} -type f -print -quit 2>/dev/null)
-if [[ -z "${KUBECONFIG}" ]]; then
-    echo "No kubeconfig found, skipping log collection"
-    exit 0
-fi
-
-mkdir -p "${ARTIFACT_DIR}"
-
-echo "Gathering OSAC logs from namespace ${E2E_NAMESPACE}..."
-
-oc get pods -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/pods.txt" 2>&1 || true
-oc get events -n "${E2E_NAMESPACE}" --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/events.txt" 2>&1 || true
-oc describe pods -n "${E2E_NAMESPACE}" > "${ARTIFACT_DIR}/pods-describe.txt" 2>&1 || true
-oc get deployments -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/deployments.txt" 2>&1 || true
-oc get jobs -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/jobs.txt" 2>&1 || true
-oc get statefulsets -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/statefulsets.txt" 2>&1 || true
-
-for pod in $(oc get pods -n "${E2E_NAMESPACE}" -o jsonpath='{.items[*].metadata.name}' 2>/dev/null); do
-    for container in $(oc get pod "${pod}" -n "${E2E_NAMESPACE}" -o jsonpath='{.spec.containers[*].name}' 2>/dev/null); do
-        oc logs "${pod}" -n "${E2E_NAMESPACE}" -c "${container}" > "${ARTIFACT_DIR}/pod-${pod}-${container}.log" 2>&1 || true
-        oc logs "${pod}" -n "${E2E_NAMESPACE}" -c "${container}" --previous > "${ARTIFACT_DIR}/pod-${pod}-${container}-previous.log" 2>/dev/null || true
-    done
-    for container in $(oc get pod "${pod}" -n "${E2E_NAMESPACE}" -o jsonpath='{.spec.initContainers[*].name}' 2>/dev/null); do
-        oc logs "${pod}" -n "${E2E_NAMESPACE}" -c "${container}" > "${ARTIFACT_DIR}/pod-${pod}-init-${container}.log" 2>&1 || true
-    done
-done
-
-for ns in keycloak ansible-aap; do
-    if oc get namespace "${ns}" &>/dev/null; then
-        mkdir -p "${ARTIFACT_DIR}/${ns}"
-        oc get pods -n "${ns}" -o wide > "${ARTIFACT_DIR}/${ns}/pods.txt" 2>&1 || true
-        oc get events -n "${ns}" --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/${ns}/events.txt" 2>&1 || true
-        oc describe pods -n "${ns}" > "${ARTIFACT_DIR}/${ns}/pods-describe.txt" 2>&1 || true
-        oc get deployments -n "${ns}" -o wide > "${ARTIFACT_DIR}/${ns}/deployments.txt" 2>&1 || true
-        oc get jobs -n "${ns}" -o wide > "${ARTIFACT_DIR}/${ns}/jobs.txt" 2>&1 || true
-        oc get statefulsets -n "${ns}" -o wide > "${ARTIFACT_DIR}/${ns}/statefulsets.txt" 2>&1 || true
-        for pod in $(oc get pods -n "${ns}" -o jsonpath='{.items[*].metadata.name}' 2>/dev/null); do
-            for container in $(oc get pod "${pod}" -n "${ns}" -o jsonpath='{.spec.containers[*].name}' 2>/dev/null); do
-                oc logs "${pod}" -n "${ns}" -c "${container}" > "${ARTIFACT_DIR}/${ns}/pod-${pod}-${container}.log" 2>&1 || true
-                oc logs "${pod}" -n "${ns}" -c "${container}" --previous > "${ARTIFACT_DIR}/${ns}/pod-${pod}-${container}-previous.log" 2>/dev/null || true
-            done
-            for container in $(oc get pod "${pod}" -n "${ns}" -o jsonpath='{.spec.initContainers[*].name}' 2>/dev/null); do
-                oc logs "${pod}" -n "${ns}" -c "${container}" > "${ARTIFACT_DIR}/${ns}/pod-${pod}-init-${container}.log" 2>&1 || true
-            done
-        done
-    fi
-done
-
-echo "=== Collecting CNV/virtualization diagnostics ==="
-mkdir -p "${ARTIFACT_DIR}/cnv"
-oc get hyperconverged -A -o yaml > "${ARTIFACT_DIR}/cnv/hyperconverged.yaml" 2>&1 || true
-oc get vms -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/vms.txt" 2>&1 || true
-oc get vmis -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/vmis.txt" 2>&1 || true
-oc get datavolumes -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/datavolumes.txt" 2>&1 || true
-oc get pvc -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/cnv/pvcs.txt" 2>&1 || true
-oc get events -n openshift-cnv --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/cnv/events-openshift-cnv.txt" 2>&1 || true
-
-# VMs with networkAttachments live in subnet namespaces, not E2E_NAMESPACE.
-# Gather VM/DataVolume diagnostics from every namespace referenced by compute instances.
-VM_NAMESPACES=$(oc get computeinstances -n "${E2E_NAMESPACE}" \
-    -o jsonpath='{.items[*].status.virtualMachineReference.namespace}' 2>/dev/null | tr ' ' '\n' | sort -u)
-for ns in ${VM_NAMESPACES}; do
-    [[ -z "${ns}" || "${ns}" == "${E2E_NAMESPACE}" ]] && continue
-    echo "  Gathering VM diagnostics from subnet namespace ${ns}..."
-    mkdir -p "${ARTIFACT_DIR}/cnv/${ns}"
-    oc get vms -n "${ns}" -o wide > "${ARTIFACT_DIR}/cnv/${ns}/vms.txt" 2>&1 || true
-    oc get vms -n "${ns}" -o yaml > "${ARTIFACT_DIR}/cnv/${ns}/vms.yaml" 2>&1 || true
-    oc get vmis -n "${ns}" -o wide > "${ARTIFACT_DIR}/cnv/${ns}/vmis.txt" 2>&1 || true
-    oc get datavolumes -n "${ns}" -o wide > "${ARTIFACT_DIR}/cnv/${ns}/datavolumes.txt" 2>&1 || true
-    oc get datavolumes -n "${ns}" -o yaml > "${ARTIFACT_DIR}/cnv/${ns}/datavolumes.yaml" 2>&1 || true
-    oc get pvc -n "${ns}" -o wide > "${ARTIFACT_DIR}/cnv/${ns}/pvcs.txt" 2>&1 || true
-    oc get events -n "${ns}" --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/cnv/${ns}/events.txt" 2>&1 || true
-    oc get networkpolicies -n "${ns}" -o yaml > "${ARTIFACT_DIR}/cnv/${ns}/networkpolicies.yaml" 2>&1 || true
-    oc get pods -n "${ns}" -o wide > "${ARTIFACT_DIR}/cnv/${ns}/pods.txt" 2>&1 || true
-    for pod in $(oc get pods -n "${ns}" -o jsonpath='{.items[*].metadata.name}' 2>/dev/null); do
-        oc logs "${pod}" -n "${ns}" --all-containers > "${ARTIFACT_DIR}/cnv/${ns}/pod-${pod}.log" 2>&1 || true
-    done
-done
-
-echo "=== Collecting compute instance status ==="
-oc get computeinstances -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/computeinstances.txt" 2>&1 || true
-oc get computeinstances -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/computeinstances.yaml" 2>&1 || true
-
-echo "=== Collecting networking status ==="
-oc get virtualnetworks -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/virtualnetworks.txt" 2>&1 || true
-oc get virtualnetworks -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/virtualnetworks.yaml" 2>&1 || true
-oc get subnets -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/subnets.txt" 2>&1 || true
-oc get subnets -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/subnets.yaml" 2>&1 || true
-oc get securitygroups -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/securitygroups.txt" 2>&1 || true
-oc get clusteruserdefinednetwork -o yaml > "${ARTIFACT_DIR}/clusteruserdefinednetwork.yaml" 2>&1 || true
-
-echo "=== Collecting cert-manager status ==="
-oc get certificates -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/certificates.txt" 2>&1 || true
-oc get certificates -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/certificates.yaml" 2>&1 || true
-oc get routes -n "${E2E_NAMESPACE}" -o wide > "${ARTIFACT_DIR}/routes.txt" 2>&1 || true
-oc get routes -n keycloak -o wide > "${ARTIFACT_DIR}/routes-keycloak.txt" 2>&1 || true
-
-echo "=== Collecting node resource usage ==="
-oc adm top node > "${ARTIFACT_DIR}/node-resources.txt" 2>&1 || true
-oc adm top pod -n "${E2E_NAMESPACE}" --sort-by=memory > "${ARTIFACT_DIR}/pod-resources.txt" 2>&1 || true
-oc get nodes -o wide > "${ARTIFACT_DIR}/nodes.txt" 2>&1 || true
-oc describe node > "${ARTIFACT_DIR}/node-describe.txt" 2>&1 || true
-
-echo "=== Collecting cluster operator status ==="
-oc get co > "${ARTIFACT_DIR}/clusteroperators.txt" 2>&1 || true
-oc get csv -n openshift-cnv -o wide > "${ARTIFACT_DIR}/cnv/csv.txt" 2>&1 || true
-
-echo "=== Collecting storage diagnostics ==="
-mkdir -p "${ARTIFACT_DIR}/storage"
-oc get pods -n openshift-storage -o wide > "${ARTIFACT_DIR}/storage/pods.txt" 2>&1 || true
-oc get events -n openshift-storage --sort-by=.lastTimestamp > "${ARTIFACT_DIR}/storage/events.txt" 2>&1 || true
-oc get lvmcluster -n openshift-storage -o yaml > "${ARTIFACT_DIR}/storage/lvmcluster.yaml" 2>&1 || true
-oc get lvmvolumegroups -n openshift-storage -o yaml > "${ARTIFACT_DIR}/storage/lvmvolumegroups.yaml" 2>&1 || true
-oc get sc -o wide > "${ARTIFACT_DIR}/storage/storageclasses.txt" 2>&1 || true
-oc get pv -o wide > "${ARTIFACT_DIR}/storage/pvs.txt" 2>&1 || true
-oc get pvc -A -o wide > "${ARTIFACT_DIR}/storage/pvcs-all.txt" 2>&1 || true
-oc get volumeattachments -o wide > "${ARTIFACT_DIR}/storage/volumeattachments.txt" 2>&1 || true
-for pod in $(oc get pods -n openshift-storage -o jsonpath='{.items[*].metadata.name}' 2>/dev/null); do
-    oc logs "${pod}" -n openshift-storage > "${ARTIFACT_DIR}/storage/pod-${pod}.log" 2>&1 || true
-done
-
-echo "=== Collecting MachineConfig diagnostics ==="
-mkdir -p "${ARTIFACT_DIR}/mco"
-oc get mcp -o wide > "${ARTIFACT_DIR}/mco/mcp.txt" 2>&1 || true
-oc get mc --sort-by=.metadata.creationTimestamp > "${ARTIFACT_DIR}/mco/mc.txt" 2>&1 || true
-oc get secret pull-secret -n openshift-config -o jsonpath='{.data.\.dockerconfigjson}' 2>/dev/null \
-    | base64 -d 2>/dev/null | jq -r '.auths | keys[]' > "${ARTIFACT_DIR}/mco/pull-secret-registries.txt" 2>&1 || true
-
-echo "=== Collecting service account pull secret state ==="
-oc get sa -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/serviceaccounts.yaml" 2>&1 || true
-oc get secrets -n "${E2E_NAMESPACE}" -o custom-columns='NAME:.metadata.name,TYPE:.type' > "${ARTIFACT_DIR}/secrets-types.txt" 2>&1 || true
-
-echo "=== Collecting AAP operator status ==="
-oc get ansibleautomationplatform -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/aap-status.yaml" 2>&1 || true
-oc get automationcontroller -n "${E2E_NAMESPACE}" -o yaml > "${ARTIFACT_DIR}/automationcontroller-status.yaml" 2>&1 || true
-
-echo "=== Collecting AAP job stdout ==="
-mkdir -p "${ARTIFACT_DIR}/aap-jobs"
-AAP_ROUTE=$(oc get route osac-aap -n "${E2E_NAMESPACE}" -o jsonpath='{.spec.host}' 2>/dev/null)
-AAP_ADMIN_PW=$(oc get secret osac-aap-controller-admin-password -n "${E2E_NAMESPACE}" \
-    -o jsonpath='{.data.password}' 2>/dev/null | base64 -d 2>/dev/null)
-if [[ -n "${AAP_ROUTE}" && -n "${AAP_ADMIN_PW}" ]]; then
-    AAP_AUTH=(-sk -u "admin:${AAP_ADMIN_PW}")
-    page=1
-    while true; do
-        page_file="${ARTIFACT_DIR}/aap-jobs/jobs-page-${page}.json"
-        curl "${AAP_AUTH[@]}" \
-            "https://${AAP_ROUTE}/api/controller/v2/jobs/?page=${page}&page_size=50&order_by=id" \
-            > "${page_file}" 2>&1 || break
-        jq -e '.results' "${page_file}" &>/dev/null || break
-        for job_id in $(jq -r '.results[]?.id // empty' "${page_file}" 2>/dev/null); do
-            status=$(jq -r ".results[] | select(.id == ${job_id}) | .status // \"unknown\"" "${page_file}" 2>/dev/null)
-            name=$(jq -r ".results[] | select(.id == ${job_id}) | .name // \"unknown\"" "${page_file}" 2>/dev/null)
-            curl "${AAP_AUTH[@]}" \
-                "https://${AAP_ROUTE}/api/controller/v2/jobs/${job_id}/stdout/?format=txt" \
-                > "${ARTIFACT_DIR}/aap-jobs/job-${job_id}-${status}-${name}.txt" 2>&1 || true
-        done
-        next=$(jq -r '.next // empty' "${page_file}" 2>/dev/null)
-        [[ -z "${next}" || "${next}" == "null" ]] && break
-        page=$((page + 1))
-    done
-    echo "  Captured stdout for $(ls "${ARTIFACT_DIR}/aap-jobs"/job-*.txt 2>/dev/null | wc -l) AAP jobs"
-    curl "${AAP_AUTH[@]}" \
-        "https://${AAP_ROUTE}/api/controller/v2/project_updates/?page_size=50&order_by=id" \
-        > "${ARTIFACT_DIR}/aap-jobs/project-updates.json" 2>&1 || true
-    for pu_id in $(jq -r '.results[]?.id // empty' "${ARTIFACT_DIR}/aap-jobs/project-updates.json" 2>/dev/null); do
-        status=$(jq -r ".results[] | select(.id == ${pu_id}) | .status // \"unknown\"" \
-            "${ARTIFACT_DIR}/aap-jobs/project-updates.json" 2>/dev/null)
-        curl "${AAP_AUTH[@]}" \
-            "https://${AAP_ROUTE}/api/controller/v2/project_updates/${pu_id}/stdout/?format=txt" \
-            > "${ARTIFACT_DIR}/aap-jobs/project-update-${pu_id}-${status}.txt" 2>&1 || true
-    done
-    echo "  Captured $(ls "${ARTIFACT_DIR}/aap-jobs"/project-update-*.txt 2>/dev/null | wc -l) AAP project updates"
-else
-    echo "  AAP route or admin password not found, skipping job stdout capture"
-fi
-
-echo "Log collection complete"
-REMOTE_EOF
-
-echo "Copying artifacts from remote machine..."
-timeout -s 9 5m scp -r -F "${SHARED_DIR}/ssh_config" "ci_machine:${REMOTE_ARTIFACT_DIR}" "${ARTIFACT_DIR}/osac-logs" 2>&1 || true
-
-echo "************ osac-project-gather: done ************"
diff --git a/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.metadata.json b/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.metadata.json
deleted file mode 100644
index 523475eb26239..0000000000000
--- a/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/gather/osac-project-gather-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.yaml b/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.yaml
deleted file mode 100644
index 8e41075be409e..0000000000000
--- a/ci-operator/step-registry/osac-project/gather/osac-project-gather-ref.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-ref:
-  as: osac-project-gather
-  best_effort: true
-  from: dev-scripts
-  timeout: 20m0s
-  commands: osac-project-gather-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  env:
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace where OSAC components are deployed
diff --git a/ci-operator/step-registry/osac-project/installer/OWNERS b/ci-operator/step-registry/osac-project/installer/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/installer/component/OWNERS b/ci-operator/step-registry/osac-project/installer/component/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/component/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh b/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh
deleted file mode 100644
index 17c7da907deae..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-commands.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-echo "************ osac-installer-component commands ************"
-echo "--- Running with the following parameters ---"
-echo "E2E_NAMESPACE: ${E2E_NAMESPACE}"
-echo "E2E_KUSTOMIZE_OVERLAY: ${E2E_KUSTOMIZE_OVERLAY}"
-echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}"
-echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}"
-echo "COMPONENT_IMAGE: ${COMPONENT_IMAGE}"
-echo "COMPONENT_IMAGE_NAME: ${COMPONENT_IMAGE_NAME}"
-echo "AAP_EE_IMAGE_OVERRIDE: ${AAP_EE_IMAGE_OVERRIDE:-}"
-echo "-------------------------------------------"
-
-base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip
-
-timeout -s 9 10m scp -F "${SHARED_DIR}/ssh_config" /tmp/license.zip ci_machine:/tmp/license.zip
-
-timeout -s 9 120m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash - << EOF|& sed -e 's/.*auths\{0,1\}".*/*** PULL_SECRET ***/g'
-
-export KUBECONFIG=\$(find \${KUBECONFIG} -type f -print -quit)
-
-oc annotate sc lvms-vg1 storageclass.kubernetes.io/is-default-class=true --overwrite
-
-echo "Waiting for OpenShift Virtualization to be ready..."
-oc wait --for=condition=Available hyperconverged/kubevirt-hyperconverged -n openshift-cnv --timeout=900s
-
-cat <<NADEOF | oc apply -f -
-apiVersion: k8s.cni.cncf.io/v1
-kind: NetworkAttachmentDefinition
-metadata:
-  name: default
-  namespace: openshift-ovn-kubernetes
-spec:
-  config: '{"cniVersion": "0.4.0", "name": "ovn-kubernetes", "type": "ovn-k8s-cni-overlay"}'
-NADEOF
-
-podman run --authfile /root/pull-secret --rm --network=host \
--v \${KUBECONFIG}:/root/.kube/config:z \
--v /root/pull-secret:/installer/overlays/${E2E_KUSTOMIZE_OVERLAY}/files/quay-pull-secret.json:z \
--v /tmp/license.zip:/installer/overlays/${E2E_KUSTOMIZE_OVERLAY}/files/license.zip:z \
--e INSTALLER_NAMESPACE=${E2E_NAMESPACE} \
--e INSTALLER_KUSTOMIZE_OVERLAY=${E2E_KUSTOMIZE_OVERLAY} \
--e INSTALLER_VM_TEMPLATE=${E2E_VM_TEMPLATE} \
--e COMPONENT_IMAGE=${COMPONENT_IMAGE} \
--e COMPONENT_IMAGE_NAME=${COMPONENT_IMAGE_NAME} \
--e AAP_EE_IMAGE_OVERRIDE=${AAP_EE_IMAGE_OVERRIDE:-} \
-${OSAC_INSTALLER_IMAGE} sh -c '
-set -euo pipefail
-
-COMPONENT_REGISTRY=\${COMPONENT_IMAGE%:*}
-COMPONENT_TAG=\${COMPONENT_IMAGE##*:}
-
-echo "Overriding image \${COMPONENT_IMAGE_NAME} -> \${COMPONENT_IMAGE}"
-cd /installer/base
-
-if ! grep -Fq "name: \${COMPONENT_IMAGE_NAME}" kustomization.yaml; then
-  echo "ERROR: image name \${COMPONENT_IMAGE_NAME} not found in /installer/base/kustomization.yaml" >&2
-  cat kustomization.yaml >&2
-  exit 1
-fi
-
-if grep -A1 "name: \${COMPONENT_IMAGE_NAME}" kustomization.yaml | grep -q "newName:"; then
-  sed -i "\#name: \${COMPONENT_IMAGE_NAME}#,/newTag:/{
-    s|newName:.*|newName: \${COMPONENT_REGISTRY}|
-    s|newTag:.*|newTag: \${COMPONENT_TAG}|
-  }" kustomization.yaml
-else
-  sed -i "\#name: \${COMPONENT_IMAGE_NAME}#{
-    a\\  newName: \${COMPONENT_REGISTRY}
-    n
-    s|newTag:.*|newTag: \${COMPONENT_TAG}|
-  }" kustomization.yaml
-fi
-
-if ! grep -Fq "\${COMPONENT_REGISTRY}" kustomization.yaml || ! grep -Fq "newTag: \${COMPONENT_TAG}" kustomization.yaml; then
-  echo "ERROR: kustomize image override failed — expected \${COMPONENT_REGISTRY}:\${COMPONENT_TAG}" >&2
-  cat kustomization.yaml >&2
-  exit 1
-fi
-
-if [ -n "\${AAP_EE_IMAGE_OVERRIDE}" ]; then
-  overlay_file="/installer/overlays/\${INSTALLER_KUSTOMIZE_OVERLAY}/kustomization.yaml"
-  if ! grep -q "AAP_EE_IMAGE=" "\${overlay_file}"; then
-    echo "ERROR: AAP_EE_IMAGE entry not found in \${overlay_file}" >&2
-    exit 1
-  fi
-  echo "Overriding AAP_EE_IMAGE -> \${COMPONENT_IMAGE}"
-  sed -i "s|AAP_EE_IMAGE=.*|AAP_EE_IMAGE=\${COMPONENT_IMAGE}|" "\${overlay_file}"
-fi
-
-cd /installer
-sh scripts/setup.sh
-'
-
-EOF
diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json b/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json
deleted file mode 100644
index d126d5daa3c9d..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/installer/component/osac-project-installer-component-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml b/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml
deleted file mode 100644
index 825cc1e43073d..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/component/osac-project-installer-component-ref.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-ref:
-  as: osac-project-installer-component
-  from: dev-scripts
-  dependencies:
-  - name: osac-installer
-    env: OSAC_INSTALLER_IMAGE
-  - name: component-image
-    env: COMPONENT_IMAGE
-  grace_period: 10m
-  timeout: 3h0m0s
-  commands: osac-project-installer-component-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  credentials:
-  - namespace: test-credentials
-    name: osac-installer-aap
-    mount_path: /var/run/osac-installer-aap
-  env:
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace to use for the e2e tests
-  - name: E2E_KUSTOMIZE_OVERLAY
-    default: "vmaas-ci"
-    documentation: The kustomize overlay to use for the e2e tests
-  - name: E2E_VM_TEMPLATE
-    default: "osac.templates.ocp_virt_vm"
-    documentation: The template to use for the e2e tests
-  - name: COMPONENT_IMAGE_NAME
-    documentation: The image name in base/kustomization.yaml to replace (e.g. ghcr.io/osac-project/fulfillment-service)
-  - name: AAP_EE_IMAGE_OVERRIDE
-    default: ""
-    documentation: If non-empty, also override AAP_EE_IMAGE in the overlay kustomization to use COMPONENT_IMAGE
diff --git a/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh b/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh
deleted file mode 100644
index b4804288d2723..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/osac-project-installer-commands.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -o nounset
-set -o errexit
-set -o pipefail
-
-echo "************ osac-installer commands ************"
-echo "--- Running with the following parameters ---"
-echo "E2E_NAMESPACE: ${E2E_NAMESPACE}"
-echo "E2E_KUSTOMIZE_OVERLAY: ${E2E_KUSTOMIZE_OVERLAY}"
-echo "E2E_VM_TEMPLATE: ${E2E_VM_TEMPLATE}"
-echo "OSAC_INSTALLER_IMAGE: ${OSAC_INSTALLER_IMAGE}"
-echo "-------------------------------------------"
-
-base64 -d /var/run/osac-installer-aap/license > /tmp/license.zip
-
-timeout -s 9 10m scp -F "${SHARED_DIR}/ssh_config" /tmp/license.zip ci_machine:/tmp/license.zip
-
-timeout -s 9 120m ssh -F "${SHARED_DIR}/ssh_config" ci_machine bash - << EOF|& sed -e 's/.*auths\{0,1\}".*/*** PULL_SECRET ***/g'
-
-export KUBECONFIG=\$(find \${KUBECONFIG} -type f -print -quit)
-
-oc annotate sc lvms-vg1 storageclass.kubernetes.io/is-default-class=true --overwrite
-
-echo "Waiting for OpenShift Virtualization to be ready..."
-oc wait --for=condition=Available hyperconverged/kubevirt-hyperconverged -n openshift-cnv --timeout=900s
-
-cat <<NADEOF | oc apply -f -
-apiVersion: k8s.cni.cncf.io/v1
-kind: NetworkAttachmentDefinition
-metadata:
-  name: default
-  namespace: openshift-ovn-kubernetes
-spec:
-  config: '{"cniVersion": "0.4.0", "name": "ovn-kubernetes", "type": "ovn-k8s-cni-overlay"}'
-NADEOF
-
-podman run --authfile /root/pull-secret --rm --network=host \
--v \${KUBECONFIG}:/root/.kube/config:z \
--v /root/pull-secret:/installer/overlays/${E2E_KUSTOMIZE_OVERLAY}/files/quay-pull-secret.json:z \
--v /tmp/license.zip:/installer/overlays/${E2E_KUSTOMIZE_OVERLAY}/files/license.zip:z \
--e INSTALLER_NAMESPACE=${E2E_NAMESPACE} \
--e INSTALLER_KUSTOMIZE_OVERLAY=${E2E_KUSTOMIZE_OVERLAY} \
--e INSTALLER_VM_TEMPLATE=${E2E_VM_TEMPLATE} \
--e DEPLOY_MODE=${DEPLOY_MODE} \
--e VALUES_FILE=${VALUES_FILE} \
--e INGRESS_SERVICE=${INGRESS_SERVICE} \
-${OSAC_INSTALLER_IMAGE} sh /installer/scripts/setup.sh
-
-EOF
diff --git a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json b/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json
deleted file mode 100644
index 46d10561390f4..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/installer/osac-project-installer-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.yaml b/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.yaml
deleted file mode 100644
index c85d996d88a8e..0000000000000
--- a/ci-operator/step-registry/osac-project/installer/osac-project-installer-ref.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-ref:
-  as: osac-project-installer
-  from: dev-scripts
-  dependencies:
-  - name: osac-installer
-    env: OSAC_INSTALLER_IMAGE
-  grace_period: 10m
-  timeout: 3h0m0s
-  commands: osac-project-installer-commands.sh
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  credentials:
-  - namespace: test-credentials
-    name: osac-installer-aap
-    mount_path: /var/run/osac-installer-aap
-  env:
-  - name: E2E_NAMESPACE
-    default: "osac-e2e-ci"
-    documentation: The namespace to use for the e2e tests
-  - name: E2E_KUSTOMIZE_OVERLAY
-    default: "vmaas-ci"
-    documentation: The kustomize overlay to use for the e2e tests
-  - name: E2E_VM_TEMPLATE
-    default: "osac.templates.ocp_virt_vm"
-    documentation: The template to use for the e2e tests
-  - name: DEPLOY_MODE
-    default: "kustomize"
-    documentation: Deploy mode for osac-installer (kustomize or helm)
-  - name: VALUES_FILE
-    default: "values/vmaas-ci/values.yaml"
-    documentation: Helm values file to use (helm mode only)
-  - name: INGRESS_SERVICE
-    default: "true"
-    documentation: Install MetalLB as the ingress/LoadBalancer service
diff --git a/ci-operator/step-registry/osac-project/notify/OWNERS b/ci-operator/step-registry/osac-project/notify/OWNERS
deleted file mode 100644
index 1511b88a190fd..0000000000000
--- a/ci-operator/step-registry/osac-project/notify/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-approvers:
-  - osac-cicd
-reviewers:
-  - osac-cicd
diff --git a/ci-operator/step-registry/osac-project/notify/osac-project-notify-commands.sh b/ci-operator/step-registry/osac-project/notify/osac-project-notify-commands.sh
deleted file mode 100755
index 35acb37b1e580..0000000000000
--- a/ci-operator/step-registry/osac-project/notify/osac-project-notify-commands.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-WEBHOOK_URL="$(cat /var/run/vault/osac-slack-webhook/url)"
-PROW_URL="https://prow.ci.openshift.org/view/gs/test-platform-results"
-
-if [[ "${JOB_TYPE:-}" != "periodic" ]]; then
-    echo "Skipping Slack notification for non-periodic job (type: ${JOB_TYPE:-unknown})"
-    exit 0
-fi
-
-JOB_URL="${PROW_URL}/logs/${JOB_NAME}/${BUILD_ID}"
-
-RESULT="UNKNOWN"
-EMOJI=":white_circle:"
-if [[ -f "${SHARED_DIR}/test-result" ]]; then
-    RESULT=$(cat "${SHARED_DIR}/test-result")
-fi
-if [[ "${RESULT}" == "PASSED" ]]; then
-    EMOJI=":large_green_circle:"
-elif [[ "${RESULT}" == "FAILED" ]]; then
-    EMOJI=":red_circle:"
-fi
-
-VERSIONS=""
-if [[ -f "${SHARED_DIR}/versions.txt" ]]; then
-    while IFS= read -r line; do
-        VERSIONS="${VERSIONS}\n${line}"
-    done < "${SHARED_DIR}/versions.txt"
-fi
-
-LABEL="${NOTIFY_LABEL:-${JOB_NAME}}"
-MESSAGE="${EMOJI} *${LABEL}* — ${RESULT}\n<${JOB_URL}|View logs>"
-if [[ -n "${VERSIONS}" ]]; then
-    MESSAGE="${MESSAGE}\n\n*Versions:*\n\`\`\`${VERSIONS}\n\`\`\`"
-fi
-
-curl --fail --silent --show-error \
-    --connect-timeout 10 --max-time 30 \
-    -X POST -H 'Content-type: application/json' \
-    --data "{\"text\":\"${MESSAGE}\"}" \
-    "${WEBHOOK_URL}"
diff --git a/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.metadata.json b/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.metadata.json
deleted file mode 100644
index f05ce1b0e9350..0000000000000
--- a/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/notify/osac-project-notify-ref.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.yaml b/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.yaml
deleted file mode 100644
index 31bd3d983eb9d..0000000000000
--- a/ci-operator/step-registry/osac-project/notify/osac-project-notify-ref.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-ref:
-  as: osac-project-notify
-  best_effort: true
-  from: dev-scripts
-  timeout: 5m0s
-  commands: osac-project-notify-commands.sh
-  credentials:
-  - namespace: test-credentials
-    name: osac-slack-webhook
-    mount_path: /var/run/vault/osac-slack-webhook
-  resources:
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  env:
-  - name: NOTIFY_LABEL
-    default: ""
-    documentation: Custom label for the Slack notification header. If empty, uses JOB_NAME.
-  documentation: |-
-    Sends a Slack notification with the job result and a link to the Prow logs.
diff --git a/ci-operator/step-registry/osac-project/ofcir/OWNERS b/ci-operator/step-registry/osac-project/ofcir/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/OWNERS b/ci-operator/step-registry/osac-project/ofcir/baremetal/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/OWNERS b/ci-operator/step-registry/osac-project/ofcir/baremetal/component/OWNERS
deleted file mode 100644
index 423362005a084..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-approvers:
-- osac-cicd
-options: {}
-reviewers:
-- osac-cicd
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.metadata.json b/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.metadata.json
deleted file mode 100644
index 4d748eaa533e5..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.yaml b/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.yaml
deleted file mode 100644
index 8a28c6c99c65c..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/component/osac-project-ofcir-baremetal-component-workflow.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-workflow:
-  as: osac-project-ofcir-baremetal-component
-  steps:
-    cluster_profile: packet-osac
-    allow_best_effort_post_steps: true
-    allow_skip_on_success: true
-    pre:
-      - ref: ofcir-acquire
-      - ref: assisted-ofcir-setup
-      - chain: assisted-common-pre
-      - ref: osac-project-installer-component
-    test:
-      - ref: osac-project-baremetal-test
-    post:
-      - ref: osac-project-gather
-      - ref: ofcir-gather
-      - ref: ofcir-release
-    env:
-      CLUSTERTYPE: "osac"
-  documentation: |-
-    This workflow executes the common end-to-end osac-test-infra test suite on a cluster
-    provisioned by running assisted-installer on a packet server. Unlike the base workflow,
-    this variant overrides a single component image with a CI-built version from a PR,
-    enabling E2E validation of component repo changes before merge.
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json b/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json
deleted file mode 100644
index cffa8269c8eaa..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"path": "osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.yaml",
-	"owners": {
-		"approvers": [
-			"osac-cicd"
-		],
-		"reviewers": [
-			"osac-cicd"
-		]
-	}
-}
\ No newline at end of file
diff --git a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.yaml b/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.yaml
deleted file mode 100644
index 2418d1aa52c43..0000000000000
--- a/ci-operator/step-registry/osac-project/ofcir/baremetal/osac-project-ofcir-baremetal-workflow.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-workflow:
-  as: osac-project-ofcir-baremetal
-  steps:
-    cluster_profile: packet-osac
-    allow_best_effort_post_steps: true
-    allow_skip_on_success: true
-    pre: 
-      - ref: ofcir-acquire
-      - ref: assisted-ofcir-setup
-      - chain: assisted-common-pre
-      - ref: osac-project-installer
-    test: 
-      - ref: osac-project-baremetal-test 
-    post:
-      - ref: osac-project-notify
-      - ref: osac-project-gather
-      - ref: ofcir-gather
-      - ref: ofcir-release
-    env:
-      CLUSTERTYPE: "osac"
-      NOTIFY_LABEL: "Full Setup vmaas (kustomize)"
-  documentation: |-
-    This workflow executes the common end-to-end osac-test-infra test suite on a cluster provisioned by running assisted-installer on a packet server.
diff --git a/core-services/sanitize-prow-jobs/_config.yaml b/core-services/sanitize-prow-jobs/_config.yaml
index 275ac9e0e7734..6132260ee9b6a 100644
--- a/core-services/sanitize-prow-jobs/_config.yaml
+++ b/core-services/sanitize-prow-jobs/_config.yaml
@@ -1744,7 +1744,6 @@ buildFarm:
       - eclipse-che-che-dashboard-main-presubmits.yaml
       - netobserv-flowlogs-pipeline-main-presubmits.yaml
       - openshift-security-profiles-operator-konflux-presubmits.yaml
-      - osac-project-osac-installer-main-presubmits.yaml
       - openshift-build-test-images-release-4.15-presubmits.yaml
       - openshift-build-test-images-release-4.23-presubmits.yaml
       - openshift-build-test-images-release-4.22-presubmits.yaml
@@ -2012,7 +2011,6 @@ buildFarm:
       - openshift-cluster-network-operator-release-4.17-periodics.yaml
       - openshift-cluster-network-operator-release-4.19-periodics.yaml
       - openshift-cluster-network-operator-master-periodics.yaml
-      - osac-project-osac-test-infra-main-periodics.yaml
       - red-hat-data-services-ods-ci-release-2.19-presubmits.yaml
       - openshift-service-mesh-sail-operator-release-3.0-periodics.yaml
       - stolostron-multicloud-operators-foundation-main-postsubmits.yaml
@@ -4507,7 +4505,6 @@ buildFarm:
       - openshift-priv-grafana-release-4.1-presubmits.yaml
       - openshift-appliance-master-periodics.yaml
       - openshift-service-mesh-proxy-release-1.24-postsubmits.yaml
-      - osac-project-osac-test-infra-main-presubmits.yaml
       - openshift-ironic-hardware-inventory-recorder-image-master-presubmits.yaml
       - devfile-registry-operator-main-presubmits.yaml
       - openshift-jenkins-sync-plugin-release-4.10-presubmits.yaml
@@ -6075,7 +6072,6 @@ buildFarm:
       - CSPI-QE-MSI-openshift-ci-trigger-poc-periodics.yaml
       - openshift-eng-ocp-build-data-openshift-5.0-presubmits.yaml
       - openshift-ironic-image-release-4.5-presubmits.yaml
-      - osac-project-osac-aap-main-presubmits.yaml
       - opendatahub-io-feast-master-presubmits.yaml
       - openshift-cluster-api-operator-release-4.11-presubmits.yaml
       - openshift-cluster-api-operator-release-4.12-presubmits.yaml
@@ -10198,7 +10194,6 @@ buildFarm:
       - openshift-priv-stolostron-volsync-addon-controller-release-5.1-presubmits.yaml
       - openshift-priv-stolostron-klusterlet-addon-controller-release-5.0-presubmits.yaml
       - openshift-priv-stolostron-mtv-integrations-release-5.0-presubmits.yaml
-      - osac-project-fulfillment-service-main-presubmits.yaml
       - openshift-online-access-transparency-service-main-presubmits.yaml
       - openshift-openshift-tests-private-release-4.22-postsubmits.yaml
       - crc-org-snc-release-4.16-presubmits.yaml
@@ -11898,7 +11893,6 @@ buildFarm:
       - openshift-kube-state-metrics-release-4.7-postsubmits.yaml
       - openshift-network-metrics-daemon-release-4.20-postsubmits.yaml
       - openshift-network-metrics-daemon-release-4.17-postsubmits.yaml
-      - osac-project-bare-metal-fulfillment-operator-main-postsubmits.yaml
       - openshift-ironic-standalone-operator-release-5.1-postsubmits.yaml
       - openshift-network-metrics-daemon-release-4.19-postsubmits.yaml
       - openshift-network-metrics-daemon-release-4.15-postsubmits.yaml
@@ -12839,7 +12833,6 @@ buildFarm:
       - openshift-rdma-cni-release-5.1-postsubmits.yaml
       - openshift-openshift-state-metrics-release-4.7-postsubmits.yaml
       - openshift-telemeter-release-4.12-postsubmits.yaml
-      - osac-project-osac-operator-main-postsubmits.yaml
       - openshift-openshift-state-metrics-release-4.8-postsubmits.yaml
       - openshift-ironic-ipa-downloader-release-4.6-postsubmits.yaml
       - openshift-builder-release-5.1-postsubmits.yaml
@@ -13260,7 +13253,6 @@ buildFarm:
       - openshift-tls-scanner-release-5.0-postsubmits.yaml
       - openshift-microshift-release-5.1-postsubmits.yaml
       - openshift-tls-scanner-release-5.1-postsubmits.yaml
-      - osac-project-osac-installer-main-postsubmits.yaml
       - openshift-microshift-release-5.0-postsubmits.yaml
       - openshift-oauth-proxy-release-4.6-postsubmits.yaml
       - openshift-oauth-proxy-release-4.8-postsubmits.yaml
@@ -13287,7 +13279,6 @@ buildFarm:
       - openshift-eventrouter-master-postsubmits.yaml
       - openshift-check-payload-main-postsubmits.yaml
       - openshift-operator-framework-rukpak-main-presubmits.yaml
-      - osac-project-osac-aap-main-postsubmits.yaml
       - openshift-cincinnati-graph-data-master-postsubmits.yaml
       - stolostron-governance-policy-propagator-release-5.0-presubmits.yaml
       - stolostron-cert-policy-controller-release-2.14-presubmits.yaml
@@ -13315,7 +13306,6 @@ buildFarm:
       - migtools-kubevirt-datamover-controller-oadp-1.6-presubmits.yaml
       - openshift-ironic-ipa-downloader-release-4.3-presubmits.yaml
       - migtools-kubevirt-datamover-controller-oadp-dev-presubmits.yaml
-      - osac-project-bare-metal-fulfillment-operator-main-presubmits.yaml
       - kube-reporting-hadoop-master-presubmits.yaml
       - openshift-linuxptp-daemon-release-4.8-presubmits.yaml
       - openshift-linuxptp-daemon-release-4.7-presubmits.yaml
@@ -16412,7 +16402,6 @@ buildFarm:
       - openshift-ironic-hardware-inventory-recorder-image-release-4.11-presubmits.yaml
       - openshift-ironic-hardware-inventory-recorder-image-release-4.13-presubmits.yaml
       - openshift-ironic-hardware-inventory-recorder-image-release-4.12-presubmits.yaml
-      - osac-project-osac-operator-main-presubmits.yaml
       - stolostron-submariner-addon-main-postsubmits.yaml
       - stolostron-cert-policy-controller-release-5.0-postsubmits.yaml
       - medik8s-must-gather-release-0.8-presubmits.yaml
@@ -17536,7 +17525,6 @@ buildFarm:
       - migtools-oadp-vmdp-oadp-dev-postsubmits.yaml
       - openshift-openshift-apiserver-release-4.3-postsubmits.yaml
       - openshift-openshift-apiserver-release-4.7-postsubmits.yaml
-      - osac-project-osac-test-infra-main-postsubmits.yaml
       - openshift-openshift-apiserver-release-4.6-postsubmits.yaml
       - openshift-openshift-apiserver-release-4.2-postsubmits.yaml
       - openshift-openshift-apiserver-release-4.4-postsubmits.yaml
@@ -27625,7 +27613,6 @@ buildFarm:
       - openshift-template-service-broker-release-4.9-postsubmits.yaml
       - openshift-template-service-broker-release-5.0-postsubmits.yaml
       - openshift-node_exporter-release-4.15-postsubmits.yaml
-      - osac-project-fulfillment-service-main-postsubmits.yaml
       - openshift-node_exporter-release-4.16-postsubmits.yaml
       - openshift-node_exporter-release-4.17-postsubmits.yaml
       - openshift-ib-sriov-cni-release-4.10-postsubmits.yaml