diff --git a/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4.yaml b/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4.yaml
index 4e603094c4f66..15d5ccc5afb2d 100644
--- a/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4.yaml
+++ b/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4.yaml
@@ -3,6 +3,15 @@ build_root:
     name: ci-framework-image
     namespace: openstack-k8s-operators
     tag: latest
+images:
+- dockerfile_literal: |
+    FROM src
+    RUN dnf install -y python3.12 python3.12-pip git make && \
+        alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 20 && \
+        alternatives --set python3 /usr/bin/python3.12 && \
+        python3 -m pip install pre-commit ansi2txt
+  from: src
+  to: edpm-ansible-pre-commit
 resources:
   '*':
     limits:
@@ -18,7 +27,7 @@ tests:
     export ANSIBLE_REMOTE_TMP=/tmp
     make -C ../ci-framework pre_commit_nodeps BASEDIR=../edpm-ansible/
   container:
-    from: src
+    from: edpm-ansible-pre-commit
   skip_if_only_changed: ^renovate.json|^README.md
 zz_generated_metadata:
   branch: 18.0-fr4
diff --git a/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-main.yaml b/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-main.yaml
index 90e72c36b6981..a46fb61aa6b1b 100644
--- a/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-main.yaml
+++ b/ci-operator/config/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-main.yaml
@@ -6,12 +6,10 @@ build_root:
 images:
 - dockerfile_literal: |
     FROM src
-    RUN dnf install -y python3.12 python3.12-pip git && \
-        (alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 20 2>/dev/null || true) && \
-        (alternatives --set python3 /usr/bin/python3.12 2>/dev/null || \
-         ln -sf /usr/bin/python3.12 /usr/bin/python3) && \
-        (ln -sf /usr/bin/pip3.12 /usr/bin/pip3 2>/dev/null || python3.12 -m ensurepip --upgrade) && \
-        python3.12 -m pip install pre-commit ansi2txt
+    RUN dnf install -y python3.12 python3.12-pip git make && \
+        alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 20 && \
+        alternatives --set python3 /usr/bin/python3.12 && \
+        python3 -m pip install pre-commit ansi2txt
   from: src
   to: edpm-ansible-pre-commit
 resources:
diff --git a/ci-operator/jobs/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4-presubmits.yaml b/ci-operator/jobs/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4-presubmits.yaml
index 5afe8f88b0532..9590724d3f3d3 100644
--- a/ci-operator/jobs/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4-presubmits.yaml
+++ b/ci-operator/jobs/openstack-k8s-operators/edpm-ansible/openstack-k8s-operators-edpm-ansible-18.0-fr4-presubmits.yaml
@@ -1,5 +1,60 @@
 presubmits:
   openstack-k8s-operators/edpm-ansible:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^18\.0-fr4$
+    - ^18\.0-fr4-
+    cluster: build02
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openstack-k8s-operators-edpm-ansible-18.0-fr4-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: