diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent
index ee719c1a8f6..d0c51beda65 100644
--- a/devstack/lib/ovn_agent
+++ b/devstack/lib/ovn_agent
@@ -500,7 +500,7 @@ function configure_ovn_plugin {
         populate_ml2_config /$Q_PLUGIN_CONF_FILE securitygroup enable_security_group="$Q_USE_SECGROUP"
         inicomment /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver
 
-        if is_service_enabled neutron-ovn-metadata-agent; then
+        if is_service_enabled q-ovn-metadata-agent; then
             populate_ml2_config /$Q_PLUGIN_CONF_FILE ovn ovn_metadata_enabled=True
         else
             populate_ml2_config /$Q_PLUGIN_CONF_FILE ovn ovn_metadata_enabled=False
@@ -519,7 +519,7 @@ function configure_ovn_plugin {
     fi
 
     if is_service_enabled n-api-meta ; then
-        if is_service_enabled neutron-ovn-metadata-agent ; then
+        if is_service_enabled q-ovn-metadata-agent ; then
             iniset $NOVA_CONF neutron service_metadata_proxy True
         fi
     fi
@@ -538,7 +538,7 @@ function configure_ovn {
     fi
 
     # Metadata
-    if is_service_enabled neutron-ovn-metadata-agent && is_service_enabled ovn-controller; then
+    if is_service_enabled q-ovn-metadata-agent && is_service_enabled ovn-controller; then
         sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR
 
         mkdir -p $NEUTRON_DIR/etc/neutron/plugins/ml2
@@ -655,8 +655,8 @@ function _start_ovn_services {
     if is_service_enabled ovn-controller-vtep ; then
         _start_process "devstack@ovn-controller-vtep.service"
     fi
-    if is_service_enabled neutron-ovn-metadata-agent; then
-        _start_process "devstack@neutron-ovn-metadata-agent.service"
+    if is_service_enabled q-ovn-metadata-agent; then
+        _start_process "devstack@q-ovn-metadata-agent.service"
     fi
 }
 
@@ -695,8 +695,8 @@ function start_ovn {
         _run_process ovn-controller-vtep "$cmd" "" "$STACK_GROUP" "root"
     fi
 
-    if is_service_enabled neutron-ovn-metadata-agent; then
-        run_process neutron-ovn-metadata-agent "$NEUTRON_OVN_BIN_DIR/$NEUTRON_OVN_METADATA_BINARY --config-file $OVN_META_CONF"
+    if is_service_enabled q-ovn-metadata-agent; then
+        run_process q-ovn-metadata-agent "$NEUTRON_OVN_BIN_DIR/$NEUTRON_OVN_METADATA_BINARY --config-file $OVN_META_CONF"
         # Format logging
         setup_logging $OVN_META_CONF
     fi
@@ -729,7 +729,7 @@ function _stop_ovs_dp {
 }
 
 function stop_ovn {
-    if is_service_enabled neutron-ovn-metadata-agent; then
+    if is_service_enabled q-ovn-metadata-agent; then
         sudo pkill -9 -f haproxy || :
         stop_process neutron-ovn-metadata-agent
     fi
diff --git a/devstack/ovn-compute-local.conf.sample b/devstack/ovn-compute-local.conf.sample
index 6657f7ab380..2ce732a7f1b 100644
--- a/devstack/ovn-compute-local.conf.sample
+++ b/devstack/ovn-compute-local.conf.sample
@@ -38,7 +38,7 @@ disable_all_services
 enable_service n-cpu
 enable_service placement-client
 enable_service ovn-controller
-enable_service neutron-ovn-metadata-agent
+enable_service q-ovn-metadata-agent
 
 # Set this to the address of the main DevStack host running the rest of the
 # OpenStack services.
diff --git a/devstack/ovn-local.conf.sample b/devstack/ovn-local.conf.sample
index 297ddbcf8b0..8d159f319fa 100644
--- a/devstack/ovn-local.conf.sample
+++ b/devstack/ovn-local.conf.sample
@@ -32,7 +32,7 @@ LOGFILE=$DEST/logs/stack.sh.log
 
 enable_service ovn-northd
 enable_service ovn-controller
-enable_service neutron-ovn-metadata-agent
+enable_service q-ovn-metadata-agent
 
 # Use Neutron instead of nova-network
 disable_service n-net
diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index 67d1c842eba..e8b7691d796 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -58,7 +58,7 @@
         ovn-controller: true
         ovs-vswitchd: true
         ovsdb-server: true
-        neutron-ovn-metadata-agent: true
+        q-ovn-metadata-agent: true
         br-ex-tcpdump: true
         br-int-flows: true
         q-dhcp: false
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index daa64d6fdcd..ef366ac0c35 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -130,7 +130,7 @@
         etcd: false
         br-ex-tcpdump: true
         br-int-flows: true
-        neutron-ovn-metadata-agent: true
+        q-ovn-metadata-agent: true
         o-api: true
         o-hk: true
         ovn-controller: true
@@ -169,7 +169,7 @@
           q-l3: false
           q-meta: false
           q-metering: false
-          neutron-ovn-metadata-agent: true
+          q-ovn-metadata-agent: true
         devstack_localrc:
           Q_AGENT: ovn
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 19ad27723e2..31cf64635a4 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -237,7 +237,7 @@
         n-novnc-cell1: true
         n-sch: true
         n-super-cond: true
-        neutron-ovn-metadata-agent: true
+        q-ovn-metadata-agent: true
         o-api: true
         o-hk: true
         ovn-controller: true