diff --git a/recipes/ml2_linuxbridge.rb b/recipes/ml2_linuxbridge.rb
index 8076bed5..842f64e0 100644
--- a/recipes/ml2_linuxbridge.rb
+++ b/recipes/ml2_linuxbridge.rb
@@ -36,10 +36,18 @@ platform_options['neutron_linuxbridge_agent_packages'].each do |pkg|
 end
 
 node.default['openstack']['network']['plugins']['linuxbridge'].tap do |lb|
-  lb['path'] =
-    '/etc/neutron/plugins/linuxbridge'
-  lb['filename'] =
-    'linuxbridge_conf.ini'
+  case node['platform_family']
+  when 'fedora', 'rhel'
+    lb['path'] =
+      '/etc/neutron/plugins/ml2'
+    lb['filename'] =
+      'linuxbridge_agent.ini'
+  when 'debian'
+    lb['path'] =
+      '/etc/neutron/plugins/linuxbridge'
+    lb['filename'] =
+      'linuxbridge_conf.ini'
+  end
   lb['conf']['securitygroup']['firewall_driver'] =
     'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver'
 end
diff --git a/spec/ml2_linuxbridge-redhat_spec.rb b/spec/ml2_linuxbridge-redhat_spec.rb
index 3d2a1ed4..c96c0a67 100644
--- a/spec/ml2_linuxbridge-redhat_spec.rb
+++ b/spec/ml2_linuxbridge-redhat_spec.rb
@@ -17,12 +17,12 @@ describe 'openstack-network::ml2_linuxbridge' do
 
     before do
       node.set['openstack']['network']['plugins']['linuxbridge']['path'] =
-        '/etc/neutron/plugins/linuxbridge'
+        '/etc/neutron/plugins/ml2'
       node.set['openstack']['network']['plugins']['linuxbridge']['filename'] =
-        'linuxbridge_conf.ini'
+        'linuxbridge_agent.ini'
     end
-    it 'creates the /etc/neutron/plugins/linuxbridge agent directory' do
-      expect(chef_run).to create_directory('/etc/neutron/plugins/linuxbridge').with(
+    it 'creates the /etc/neutron/plugins/ml2 agent directory' do
+      expect(chef_run).to create_directory('/etc/neutron/plugins/ml2').with(
         owner: 'neutron',
         group: 'neutron',
         mode: 0700
@@ -32,9 +32,9 @@ describe 'openstack-network::ml2_linuxbridge' do
       expect(chef_run).to include_recipe('openstack-network::plugin_config')
     end
 
-    describe '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini' do
+    describe '/etc/neutron/plugins/ml2/linuxbridge_agent.ini' do
       let(:file) do
-        chef_run.template('/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini')
+        chef_run.template('/etc/neutron/plugins/ml2/linuxbridge_agent.ini')
       end
       [
         /^firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver$/
@@ -57,7 +57,7 @@ describe 'openstack-network::ml2_linuxbridge' do
     end
     it do
       service = chef_run.service('neutron-linuxbridge-agent')
-      expect(service).to(subscribe_to('template[/etc/neutron/neutron.conf]').on(:restart).delayed) && subscribe_to('template[/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini]').on(:restart).delayed
+      expect(service).to(subscribe_to('template[/etc/neutron/neutron.conf]').on(:restart).delayed) && subscribe_to('template[/etc/neutron/plugins/ml2/linuxbridge_agent.ini]').on(:restart).delayed
     end
   end
 end