diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 79beb0593bd..7cf3cf95950 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -174,6 +174,8 @@
             SECURITYGROUP:
               enable_ipset: false  # Not compatible with nftables
 
+# NOTE(ralonsoh): to be removed in 2026.2, once the OVN Metadata agent
+# replacement finishes. See LP#2112313.
 - job:
     name: neutron-tempest-plugin-ovn-with-ovn-metadata-agent
     parent: neutron-tempest-plugin-ovn
diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml
index e8175f69be1..4711c5bb6cb 100644
--- a/zuul.d/grenade.yaml
+++ b/zuul.d/grenade.yaml
@@ -295,6 +295,7 @@
           OVN_BUILD_MODULES: false
         shared:
           Q_AGENT: ovn
+          OVN_AGENT_EXTENSIONS: 'metadata'
           # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
           # driver has been removed from this list. Re-add it once the removal
           # is finished or the mech driver does not call monkey_patch().
@@ -321,7 +322,8 @@
         etcd: false
         br-ex-tcpdump: true
         br-int-flows: true
-        q-ovn-metadata-agent: true
+        q-ovn-metadata-agent: false
+        q-ovn-agent: true
         ovn-controller: true
         ovn-northd: true
         ovs-vswitchd: true
@@ -370,7 +372,8 @@
           q-l3: false
           q-meta: false
           q-metering: false
-          q-ovn-metadata-agent: true
+          q-ovn-metadata-agent: false
+          q-ovn-agent: true
           tls-proxy: false
           # Cinder services
           c-bak: false
@@ -387,6 +390,7 @@
             OVN_BUILD_MODULES: false
           shared:
             Q_AGENT: ovn
+            OVN_AGENT_EXTENSIONS: 'metadata'
             # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
             # driver has been removed from this list. Re-add it once the removal
             # is finished or the mech driver does not call monkey_patch().
diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index e80cac3d4fc..94b4bf0a7f1 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -150,7 +150,8 @@
         ovn-controller: true
         ovs-vswitchd: true
         ovsdb-server: true
-        q-ovn-metadata-agent: true
+        q-ovn-metadata-agent: false
+        q-ovn-agent: true
         br-ex-tcpdump: true
         br-int-flows: true
         q-dhcp: false
@@ -172,6 +173,7 @@
         s-proxy: false
       devstack_localrc:
         Q_AGENT: ovn
+        OVN_AGENT_EXTENSIONS: 'metadata'
         ML2_L3_PLUGIN: ovn-router,trunk
         # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
         # driver has been removed from this list. Re-add it once the removal
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index b1da0d40a8c..92067445ea7 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -440,6 +440,7 @@
         DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
         DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
         Q_AGENT: ovn
+        OVN_AGENT_EXTENSIONS: 'metadata'
         ML2_L3_PLUGIN: ovn-router,trunk
         # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
         # driver has been removed from this list. Re-add it once the removal
@@ -468,7 +469,8 @@
         etcd: false
         br-ex-tcpdump: true
         br-int-flows: true
-        q-ovn-metadata-agent: true
+        q-ovn-metadata-agent: false
+        q-ovn-agent: true
         ovn-controller: true
         ovn-northd: true
         ovs-vswitchd: true
@@ -515,7 +517,8 @@
           q-l3: false
           q-meta: false
           q-metering: false
-          q-ovn-metadata-agent: true
+          q-ovn-metadata-agent: false
+          q-ovn-agent: true
           tls-proxy: true
           dstat: true
           # Cinder services
@@ -523,6 +526,7 @@
           c-vol: false
         devstack_localrc:
           Q_AGENT: ovn
+          OVN_AGENT_EXTENSIONS: 'metadata'
           # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
           # driver has been removed from this list. Re-add it once the removal
           # is finished or the mech driver does not call monkey_patch().
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 02a3ac0a938..87076d90868 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -485,6 +485,7 @@
         DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
         DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
         Q_AGENT: ovn
+        OVN_AGENT_EXTENSIONS: 'metadata'
         ML2_L3_PLUGIN: ovn-router,trunk
         # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
         # driver has been removed from this list. Re-add it once the removal
@@ -530,7 +531,8 @@
         n-novnc-cell1: true
         n-sch: true
         n-super-cond: true
-        q-ovn-metadata-agent: true
+        q-ovn-metadata-agent: false
+        q-ovn-agent: true
         ovn-controller: true
         ovn-northd: true
         ovs-vswitchd: true