diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 286e06b0df..ea34e763fe 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -474,10 +474,8 @@
               # enable qos service plugin
               export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
               # also enable qos ml2 extension driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]"
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]"
-              # port_security is enabled by default
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
+              # (port_security is enabled in default gate job)
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
           fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -1138,10 +1136,8 @@
               # enable qos service plugin
               export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
               # also enable qos ml2 extension driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]"
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]"
-              # port_security is enabled by default
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
+              # (port_security is enabled in default gate job)
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
           fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index c00b0a5163..5c0ffac616 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -29,10 +29,8 @@
               # enable qos service plugin
               export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
               # also enable qos ml2 extension driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]"
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]"
-              # port_security is enabled by default
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
+              # (port_security is enabled in default gate job)
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
           fi
 
           function gate_hook {{
@@ -90,10 +88,8 @@
               # enable qos service plugin
               export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
               # also enable qos ml2 extension driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]"
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]"
-              # port_security is enabled by default
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
+              # (port_security is enabled in default gate job)
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
           fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -281,10 +277,8 @@
               # enable qos service plugin
               export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
               # also enable qos ml2 extension driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/\$Q_PLUGIN_CONF_FILE]]"
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"[ml2]"
-              # port_security is enabled by default
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"extension_drivers = port_security,qos"
+              # (port_security is enabled in default gate job)
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_EXT_DRIVERS=port_security,qos"
           fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh