diff --git a/group.yml b/group.yml
index 375543782..71161c438 100644
--- a/group.yml
+++ b/group.yml
@@ -51,6 +51,14 @@ konflux:
     enabled: true
   network_mode: hermetic
 
+okd:
+  konflux:
+    build_priority: 8
+    cachi2:
+      enabled: false
+      lockfile:
+        force: false
+
 multi_arch:
   enabled: true
 
diff --git a/images/ci-openshift-base.rhel9.yml b/images/ci-openshift-base.rhel9.yml
index 05f9d2a1d..23541c9ea 100644
--- a/images/ci-openshift-base.rhel9.yml
+++ b/images/ci-openshift-base.rhel9.yml
@@ -66,3 +66,5 @@ scan_sources:
   - '*'
 konflux:
   network_mode: open
+okd:
+  mode: disabled
diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml
index 3ca137363..28a1fa400 100644
--- a/images/ci-openshift-build-root-latest.rhel8.yml
+++ b/images/ci-openshift-build-root-latest.rhel8.yml
@@ -57,3 +57,5 @@ scan_sources:
   - '*'
 konflux:
   network_mode: open
+okd:
+  mode: disabled
diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml
index b83d3ab38..931bbd310 100644
--- a/images/ci-openshift-build-root-latest.rhel9.yml
+++ b/images/ci-openshift-build-root-latest.rhel9.yml
@@ -59,3 +59,5 @@ scan_sources:
   - '*'
 konflux:
   network_mode: open
+okd:
+  mode: disabled
\ No newline at end of file
diff --git a/images/ci-openshift-golang-builder-latest.rhel8.yml b/images/ci-openshift-golang-builder-latest.rhel8.yml
index ca0de2b64..05d55e03b 100644
--- a/images/ci-openshift-golang-builder-latest.rhel8.yml
+++ b/images/ci-openshift-golang-builder-latest.rhel8.yml
@@ -60,3 +60,5 @@ scan_sources:
   - '*'
 konflux:
   network_mode: open
+okd:
+  mode: disabled
diff --git a/images/ci-openshift-golang-builder-latest.rhel9.yml b/images/ci-openshift-golang-builder-latest.rhel9.yml
index 204aed467..da62ecce3 100644
--- a/images/ci-openshift-golang-builder-latest.rhel9.yml
+++ b/images/ci-openshift-golang-builder-latest.rhel9.yml
@@ -60,3 +60,5 @@ scan_sources:
   - '*'
 konflux:
   network_mode: open
+okd:
+  mode: disabled
diff --git a/images/cluster-node-tuning-operator.yml b/images/cluster-node-tuning-operator.yml
index 38bd020c8..5d9ba2d65 100644
--- a/images/cluster-node-tuning-operator.yml
+++ b/images/cluster-node-tuning-operator.yml
@@ -12,8 +12,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: Dockerfile
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: cluster-node-tuning-operator-container
diff --git a/images/dpu-intel-ipu-p4sdk.yml b/images/dpu-intel-ipu-p4sdk.yml
index 819aeaa4d..5148e3d28 100644
--- a/images/dpu-intel-ipu-p4sdk.yml
+++ b/images/dpu-intel-ipu-p4sdk.yml
@@ -42,3 +42,16 @@ konflux:
     lockfile:
       inspect_parent: false
   network_mode: open
+okd:
+  content:
+    source:
+      modifications:
+      - action: replace
+        match: "COPY openshift/install-dpu.sh ."
+        replacement: |
+          COPY openshift/install-dpu.sh .
+          # Create a pip.conf file to globally set --ignore-installed.
+          # Needed as the base centos image has setuptools installed by a package manager
+          RUN mkdir -p /root/.config/pip && \
+            echo "[install]" > /root/.config/pip/pip.conf && \
+            echo "ignore-installed = true" >> /root/.config/pip/pip.conf
\ No newline at end of file
diff --git a/images/dpu-intel-ipu-vsp.yml b/images/dpu-intel-ipu-vsp.yml
index c6647fcab..a358985b6 100644
--- a/images/dpu-intel-ipu-vsp.yml
+++ b/images/dpu-intel-ipu-vsp.yml
@@ -72,3 +72,16 @@ konflux:
       - libubsan
       - libxcrypt-devel
       - make
+okd:
+  content:
+    source:
+      modifications:
+      - action: replace
+        match: "COPY openshift/install-dpu.sh ."
+        replacement: |
+          COPY openshift/install-dpu.sh .
+          # Create a pip.conf file to globally set --ignore-installed.
+          # Needed as the base centos image has setuptools installed by a package manager
+          RUN mkdir -p /root/.config/pip && \
+            echo "[install]" > /root/.config/pip/pip.conf && \
+            echo "ignore-installed = true" >> /root/.config/pip/pip.conf
diff --git a/images/driver-toolkit.yml b/images/driver-toolkit.yml
index 049357ba7..0346bb37f 100644
--- a/images/driver-toolkit.yml
+++ b/images/driver-toolkit.yml
@@ -38,7 +38,7 @@ enabled_repos:
 - rhel-96-highavailability
 for_payload: true
 from:
-  member: openshift-enterprise-base-rhel9
+  stream: centos_stream10
 name: openshift/driver-toolkit-rhel9
 payload_name: driver-toolkit
 owners:
@@ -47,3 +47,13 @@ konflux:
   cachi2:
     lockfile:
       inspect_parent: false
+okd:
+  content:
+    source:
+      modifications:
+      - action: replace
+        match: "diff --side-by-side <(rpm -qi kernel-core | grep 'Source RPM') <(rpm -qi kernel-rt-core | grep 'Source RPM'); \\"
+        replacement: |-
+          diff --side-by-side <(rpm -qi kernel-core | grep 'Source RPM') <(rpm -qi kernel-rt-core | grep 'Source RPM') || true; \
+  enabled_repos:
+  - rhel-96-nfv
\ No newline at end of file
diff --git a/images/ironic-agent.yml b/images/ironic-agent.yml
index 667d54719..a97cca813 100644
--- a/images/ironic-agent.yml
+++ b/images/ironic-agent.yml
@@ -11,8 +11,6 @@ content:
       web: https://github.com/openshift/ironic-agent-image
     pkg_managers:
     - pip
-    okd_alignment:
-      dockerfile: Dockerfile.okd
 cachito:
   enabled: true
   packages:
@@ -43,3 +41,7 @@ enabled_repos:
 - rhel-9-server-ironic-rpms
 konflux:
   network_mode: open
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.okd
diff --git a/images/ironic.yml b/images/ironic.yml
index 8397c76ec..5b3a5af28 100644
--- a/images/ironic.yml
+++ b/images/ironic.yml
@@ -11,8 +11,6 @@ content:
       web: https://github.com/openshift/ironic-image
     pkg_managers:
     - pip
-    okd_alignment:
-      dockerfile: Dockerfile.scos
 cachito:
   enabled: true
   packages:
@@ -46,3 +44,8 @@ owners:
 - ironic-osp-owners@redhat.com
 konflux:
   network_mode: open
+
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.scos
diff --git a/images/marketplace-operator.yml b/images/marketplace-operator.yml
index 12e599626..e89babcdd 100644
--- a/images/marketplace-operator.yml
+++ b/images/marketplace-operator.yml
@@ -10,8 +10,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: Dockerfile.okd
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: marketplace-operator-container
@@ -29,3 +27,7 @@ name: openshift/ose-operator-marketplace-rhel9
 payload_name: operator-marketplace
 owners:
 - aos-marketplace@redhat.com
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.okd
\ No newline at end of file
diff --git a/images/monitoring-plugin.yml b/images/monitoring-plugin.yml
index b0531c808..890d8bc3b 100644
--- a/images/monitoring-plugin.yml
+++ b/images/monitoring-plugin.yml
@@ -26,8 +26,6 @@ content:
     pkg_managers:
     - npm
     - gomod
-    okd_alignment:
-      dockerfile: Dockerfile
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: monitoring-plugin-container
@@ -50,3 +48,8 @@ konflux:
   cachito:
     mode: emulation
   network_mode: open
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile
+      modifications: []
diff --git a/images/oc-mirror-plugin.yml b/images/oc-mirror-plugin.yml
index a00d11935..fbf770da5 100644
--- a/images/oc-mirror-plugin.yml
+++ b/images/oc-mirror-plugin.yml
@@ -16,8 +16,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: images/cli/Dockerfile.ci
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: oc-mirror-plugin-container
@@ -41,3 +39,7 @@ owners:
 konflux:
   cachito:
     mode: removal
+okd:
+  content:
+    source:
+      dockerfile: images/cli/Dockerfile.ci
diff --git a/images/okd-only-upi-installer.yml b/images/okd-only-upi-installer.yml
index 19e388ce6..4e323a4cc 100644
--- a/images/okd-only-upi-installer.yml
+++ b/images/okd-only-upi-installer.yml
@@ -14,12 +14,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      resources:
-        upi-installer:
-          requests:
-            cpu: "3"
-            memory: 5Gi
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-installer-container
diff --git a/images/openshift-base-nodejs.rhel9.yml b/images/openshift-base-nodejs.rhel9.yml
index 30213691c..7fb4b2f8a 100644
--- a/images/openshift-base-nodejs.rhel9.yml
+++ b/images/openshift-base-nodejs.rhel9.yml
@@ -15,7 +15,7 @@ content:
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-{MAJOR}.{MINOR}
     okd_alignment:
       resolve_as:
-        image: registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-{MAJOR}.{MINOR}
+        stream: nodejs-rhel9
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openshift-base-nodejs-container
@@ -45,4 +45,6 @@ canonical_builders_from_upstream: false
 konflux:
   cachi2:
     lockfile:
-      inspect_parent: false
\ No newline at end of file
+      inspect_parent: false
+okd:
+  mode: disabled
diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml
index 32bc92365..e1587fc4c 100644
--- a/images/openshift-base-rhel9.yml
+++ b/images/openshift-base-rhel9.yml
@@ -40,3 +40,5 @@ owners:
 canonical_builders_from_upstream: false
 konflux:
   network_mode: hermetic
+okd:
+  mode: disabled
diff --git a/images/openshift-enterprise-ansible-operator.yml b/images/openshift-enterprise-ansible-operator.yml
index 783bb8936..1a9084c24 100644
--- a/images/openshift-enterprise-ansible-operator.yml
+++ b/images/openshift-enterprise-ansible-operator.yml
@@ -69,4 +69,7 @@ konflux:
       - make
       - libasan
       - libatomic
-      - libubsan
\ No newline at end of file
+      - libubsan
+okd:
+  enabled_repos:
+  - rhel-9-codeready-builder-rpms
diff --git a/images/openshift-enterprise-base-rhel9.yml b/images/openshift-enterprise-base-rhel9.yml
index 659bf5912..e67772ce2 100644
--- a/images/openshift-enterprise-base-rhel9.yml
+++ b/images/openshift-enterprise-base-rhel9.yml
@@ -25,9 +25,6 @@ content:
     okd_alignment:
       # The tag name in the okd stream to which this image should be promoted
       tag_name: base-stream9
-      inject_rpm_repositories:
-      - id: rhel-9-server-ose
-        baseurl: http://base-{MAJOR}-{MINOR}-rhel9.ocp.svc/rhel-9-server-ose
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openshift-enterprise-base-rhel9-container
@@ -49,4 +46,4 @@ owners:
 konflux:
   cachi2:
     lockfile:
-      inspect_parent: false
\ No newline at end of file
+      inspect_parent: false
diff --git a/images/openshift-enterprise-haproxy-router.yml b/images/openshift-enterprise-haproxy-router.yml
index 23daee2f8..351ca29b9 100644
--- a/images/openshift-enterprise-haproxy-router.yml
+++ b/images/openshift-enterprise-haproxy-router.yml
@@ -30,3 +30,6 @@ name: openshift/ose-haproxy-router-rhel9
 payload_name: haproxy-router
 owners:
 - aos-network-edge@redhat.com
+okd:
+  enabled_repos:
+  - rhel-9-server-ose-rpms
diff --git a/images/ose-agent-installer-api-server.yml b/images/ose-agent-installer-api-server.yml
index 5a249554d..4d9e4cd70 100644
--- a/images/ose-agent-installer-api-server.yml
+++ b/images/ose-agent-installer-api-server.yml
@@ -59,3 +59,9 @@ konflux:
       - make
       - nmstate-devel
   network_mode: open  # modular metadata issue with postgresql packages - see ART-14111
+okd:
+  enabled_repos:
+  - rhel-9-appstream-rpms
+  - rhel-9-codeready-builder-rpms
+  - rhel-9-server-ose-rpms
+  - rhel-9-baseos-rpms
diff --git a/images/ose-agent-installer-csr-approver.yml b/images/ose-agent-installer-csr-approver.yml
index 750b77ce8..ad02f9e38 100644
--- a/images/ose-agent-installer-csr-approver.yml
+++ b/images/ose-agent-installer-csr-approver.yml
@@ -34,3 +34,6 @@ name: openshift/ose-agent-installer-csr-approver-rhel9
 payload_name: agent-installer-csr-approver
 owners:
 - ocp-agent-team@redhat.com
+okd:
+  enabled_repos:
+  - rhel-9-server-ose-rpms
diff --git a/images/ose-agent-installer-utils.yml b/images/ose-agent-installer-utils.yml
index e464ea1be..ecce76290 100644
--- a/images/ose-agent-installer-utils.yml
+++ b/images/ose-agent-installer-utils.yml
@@ -58,3 +58,8 @@ konflux:
       - libxcrypt-devel
       - make
       - nmstate-devel
+okd:
+  enabled_repos:
+  - rhel-9-appstream-rpms
+  - rhel-9-codeready-builder-rpms
+  - rhel-9-baseos-rpms
diff --git a/images/ose-baremetal-installer.yml b/images/ose-baremetal-installer.yml
index e1cfb4a4e..ab092f3af 100644
--- a/images/ose-baremetal-installer.yml
+++ b/images/ose-baremetal-installer.yml
@@ -10,12 +10,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      resources:
-        baremetal-installer:
-          requests:
-            cpu: "3"
-            memory: 5Gi
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-baremetal-installer-container
@@ -46,3 +40,6 @@ konflux:
     x86_64: linux-c4xlarge/amd64
     aarch64: linux-c4xlarge/arm64
   network_mode: open
+okd:
+  enabled_repos:
+  - rhel-9-server-ose-rpms
diff --git a/images/ose-cluster-samples-operator.yml b/images/ose-cluster-samples-operator.yml
index 5b086df9d..3612adf73 100644
--- a/images/ose-cluster-samples-operator.yml
+++ b/images/ose-cluster-samples-operator.yml
@@ -9,8 +9,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: Dockerfile.okd
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-cluster-samples-operator-container
@@ -28,3 +26,7 @@ name: openshift/ose-cluster-samples-rhel9-operator
 payload_name: cluster-samples-operator
 owners:
 - openshift-build-api@redhat.com
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.okd
diff --git a/images/ose-cluster-update-keys.yml b/images/ose-cluster-update-keys.yml
index 258295763..400ec52d3 100644
--- a/images/ose-cluster-update-keys.yml
+++ b/images/ose-cluster-update-keys.yml
@@ -14,8 +14,6 @@ content:
         - backport-risk-assessed
         - bugzilla/valid-bug
         - cherry-pick-approved
-    okd_alignment:
-      dockerfile: Dockerfile
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-cluster-update-keys-container
@@ -31,3 +29,7 @@ name: openshift/ose-cluster-update-keys-rhel9
 payload_name: cluster-update-keys
 owners:
 - aos-team-art@redhat.com
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile
diff --git a/images/ose-etcd.yml b/images/ose-etcd.yml
index 602b45f67..e14d778d0 100644
--- a/images/ose-etcd.yml
+++ b/images/ose-etcd.yml
@@ -28,8 +28,6 @@ content:
       streams_prs:
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: Dockerfile.rhel
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-etcd-container
@@ -64,3 +62,7 @@ konflux:
   content:
     source:
       dockerfile: Dockerfile.rhel
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.rhel
diff --git a/images/ose-insights-runtime-extractor.yml b/images/ose-insights-runtime-extractor.yml
index ab64c9f62..2621f996f 100644
--- a/images/ose-insights-runtime-extractor.yml
+++ b/images/ose-insights-runtime-extractor.yml
@@ -62,3 +62,6 @@ konflux:
       - rust-std-static
       - rust-toolset
       - rustfmt
+okd:
+  enabled_repos:
+  - rhel-9-server-ose-rpms
diff --git a/images/ose-installer-etcd-artifacts.yml b/images/ose-installer-etcd-artifacts.yml
index 2cd2cd9e2..e8378519c 100644
--- a/images/ose-installer-etcd-artifacts.yml
+++ b/images/ose-installer-etcd-artifacts.yml
@@ -30,8 +30,6 @@ content:
         enabled: false
         ci_build_root:
           member: ci-openshift-build-root-latest.rhel9
-    okd_alignment:
-      dockerfile: Dockerfile.installer
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-installer-etcd-artifacts-container
@@ -66,3 +64,7 @@ konflux:
   content:
     source:
       dockerfile: Dockerfile.installer.art-cachi2
+okd:
+  content:
+    source:
+      dockerfile: Dockerfile.installer
diff --git a/images/ose-libvirt-machine-controllers.yml b/images/ose-libvirt-machine-controllers.yml
index 0aa7e5b62..b64133013 100644
--- a/images/ose-libvirt-machine-controllers.yml
+++ b/images/ose-libvirt-machine-controllers.yml
@@ -41,3 +41,8 @@ konflux:
   network_mode: open
   cachi2:
     enabled: false # https://issues.redhat.com/browse/ART-13260
+okd:
+  enabled_repos:
+  - rhel-9-baseos-rpms
+  - rhel-9-appstream-rpms
+  - rhel-9-codeready-builder-rpms
diff --git a/images/ose-ovn-kubernetes.yml b/images/ose-ovn-kubernetes.yml
index f4cc8edee..c8604bc28 100644
--- a/images/ose-ovn-kubernetes.yml
+++ b/images/ose-ovn-kubernetes.yml
@@ -58,3 +58,6 @@ name: openshift/ose-ovn-kubernetes-rhel9
 payload_name: ovn-kubernetes
 owners:
 - aos-networking-staff@redhat.com
+okd:
+  enabled_repos:
+  - rhel-9-server-ose-rpms