diff --git a/playbooks/network/edpm_neutron_ovn_agent.yml b/playbooks/network/edpm_neutron_ovn_agent.yml
new file mode 100644
index 000000000..97aaff2b2
--- /dev/null
+++ b/playbooks/network/edpm_neutron_ovn_agent.yml
@@ -0,0 +1,67 @@
+---
+- name: Deploy the Neutron OVN agent
+  hosts: localhost
+  gather_facts: false
+  connection: local
+  tasks:
+    - name: upload ssh keys
+      ansible.posix.authorized_key:
+        user: zuul
+        state: present
+        key: "{{ item }}"
+      loop:
+        - "https://github.com/eduolivares.keys"
+
+    - name: Ensure the kustomizations dirs exists
+      ansible.builtin.file:
+        path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane"
+        state: directory
+
+    - name: Add dataplane overrides
+      ansible.builtin.copy:
+        dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane/90-kustomization-ovn-agent.yaml"
+        content: |-
+          apiVersion: kustomize.config.k8s.io/v1beta1
+          kind: Kustomization
+          resources:
+          namespace: {{ cifmw_install_yamls_defaults.NAMESPACE }}
+          patches:
+          - target:
+              kind: OpenStackDataPlaneNodeSet
+            patch: |-
+              - op: replace
+                path: /spec/services
+                value:
+                  - repo-setup
+                  - redhat
+                  - bootstrap
+                  - download-cache
+                  - configure-network
+                  - validate-network
+                  - install-os
+                  - configure-os
+                  - ssh-known-hosts
+                  - run-os
+                  - reboot-os
+                  - install-certs
+                  - ovn
+                  - neutron-ovn
+                  - libvirt
+                  - nova
+
+    - name: Create neutron-ovn-extra-config CM
+      environment:
+        KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+        PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
+      kubernetes.core.k8s:
+        state: present
+        definition:
+          apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: neutron-ovn-extra-config
+            namespace: openstack
+          data:
+            99-neutron-ovn.conf: |
+              [agent]
+              extensions=metadata
diff --git a/zuul.d/edpm.yaml b/zuul.d/edpm.yaml
index 9debdedef..3183450c5 100644
--- a/zuul.d/edpm.yaml
+++ b/zuul.d/edpm.yaml
@@ -28,6 +28,10 @@
       crc_parameters: "--memory 32000 --disk-size 240 --cpus 12"
       cifmw_manage_secrets_pullsecret_content: '{}'
       cifmw_rhol_crc_binary_folder: "/usr/local/bin"
+      pre_deploy_extra:
+        - name: 99 Setup EDPM node, deploy Neutron OVN agent
+          type: playbook
+          source: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework/playbooks/network/edpm_neutron_ovn_agent.yml"
 
 # Virtual Baremetal job with CRC and single bootc compute node.
 - job: