diff --git a/attributes/default.rb b/attributes/default.rb
index 201717b..66dc81b 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -27,7 +27,7 @@ default['openstack']['mq']['cluster'] = false
 default['openstack']['mq']['search_for_cluster_disk_nodes'] = true
 
 if platform_family?('debian', 'suse')
-  override['rabbitmq']['use_distro_version'] = true
+  normal['rabbitmq']['use_distro_version'] = true
   normal['rabbitmq']['config'] = '/etc/rabbitmq/rabbitmq.config'
 end
 
diff --git a/metadata.rb b/metadata.rb
index 4d46de0..75e51c7 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-dev@lists.openstack.org'
 license          'Apache-2.0'
 description      'Provides the shared messaging configuration for Chef for OpenStack.'
-version          '17.0.3'
+version          '17.0.4'
 
 recipe 'server', 'Installs and configures server packages for messaging queue used by the deployment.'
 recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via the server recipe'