diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
index 424969fa48..be17abdda2 100644
--- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
@@ -120,12 +120,10 @@ outputs:
             - get_attr: [NeutronOvsAgent, role_data, config_settings]
             - keys:
                 tripleo::neutron_ovs_agent::firewall_rules: tripleo::neutron_ovs_dpdk_agent::firewall_rules
+          - nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
           - get_attr: [RoleParametersValue, value]
       service_config_settings:
-        map_merge:
-          - get_attr: [NeutronOvsAgent, role_data, service_config_settings]
-          - nova_libvirt:
-              nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
+        get_attr: [NeutronOvsAgent, role_data, service_config_settings]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2