diff --git a/CHANGELOG.md b/CHANGELOG.md
index 066dbbc..592830e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This file is used to list changes made in each version of cookbook-openstack-ops
 * Configure rabbitmq port for both ssl and non-ssl cases
 * Fix metadata version constraint for common
 * Bump Chef gem to 11.16
+* No need to push our rabbit user/password to rabbit cookbook
 
 ## 10.0.0
 * Upgrading to Juno
diff --git a/recipes/rabbitmq-server.rb b/recipes/rabbitmq-server.rb
index 84fa7e4..15b5728 100644
--- a/recipes/rabbitmq-server.rb
+++ b/recipes/rabbitmq-server.rb
@@ -43,8 +43,6 @@ else
   node.override['rabbitmq']['port'] = rabbit_endpoint.port
 end
 node.override['rabbitmq']['address'] = listen_address
-node.override['rabbitmq']['default_user'] = user
-node.override['rabbitmq']['default_pass'] = pass
 
 # Clustering
 if node['openstack']['mq']['cluster']
@@ -59,6 +57,8 @@ end
 include_recipe 'rabbitmq'
 include_recipe 'rabbitmq::mgmt_console'
 
+# TODO(mrv) This could be removed once support for this is added to the rabbitmq cookbook.
+# Issue: https://github.com/kennonkwok/rabbitmq/issues/136
 rabbitmq_user 'remove rabbit guest user' do
   user 'guest'
   action :delete
diff --git a/spec/rabbitmq-server_spec.rb b/spec/rabbitmq-server_spec.rb
index c2c30a5..4db9737 100644
--- a/spec/rabbitmq-server_spec.rb
+++ b/spec/rabbitmq-server_spec.rb
@@ -15,8 +15,6 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
       expect(chef_run.node['openstack']['mq']['rabbitmq']['use_ssl']).to be_falsey
       expect(chef_run.node['rabbitmq']['port']).to eq(5672)
       expect(chef_run.node['rabbitmq']['address']).to eq('127.0.0.1')
-      expect(chef_run.node['rabbitmq']['default_user']).to eq('guest')
-      expect(chef_run.node['rabbitmq']['default_pass']).to eq('rabbit-pass')
       expect(chef_run.node['rabbitmq']['use_distro_version']).to be_truthy
     end