diff --git a/Puppetfile b/Puppetfile
index 7344df564..a39d86508 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -129,8 +129,8 @@ mod 'nssdb',
   :ref => 'master'
 
 mod 'rabbitmq',
-  :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq',
-  :ref => '5.6.0'
+  :git => 'https://github.com/voxpupuli/puppet-rabbitmq',
+  :ref => 'master'
 
 mod 'redis',
   :git => 'https://github.com/arioch/puppet-redis',
diff --git a/packstack/puppet/modules/packstack/manifests/amqp.pp b/packstack/puppet/modules/packstack/manifests/amqp.pp
index 90429af58..ad3389230 100644
--- a/packstack/puppet/modules/packstack/manifests/amqp.pp
+++ b/packstack/puppet/modules/packstack/manifests/amqp.pp
@@ -28,11 +28,11 @@ define enable_rabbitmq {
       package_provider         => 'yum',
       repos_ensure             => false,
       admin_enable             => false,
+      loopback_users           => [],
       # FIXME: it's ugly to not to require client certs
       ssl_fail_if_no_peer_cert => true,
       config_variables         => {
      'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
-     'loopback_users'     => '[]',
       },
     }
   } else {
@@ -44,21 +44,12 @@ define enable_rabbitmq {
       package_provider => 'yum',
       repos_ensure     => false,
       admin_enable     => false,
+      loopback_users   => [],
       config_variables => {
      'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
-     'loopback_users'     => '[]',
       },
     }
   }
-
-  # TO-DO: remove this workaround as soon as this is fixed in puppetlabs-rabbitmq module
-  #        https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/454
-  File <| path == '/etc/rabbitmq/rabbitmq.config' |> {
-    ensure  => present,
-    owner   => 'rabbitmq',
-    group   => 'rabbitmq',
-    mode    => '0640',
-  }
 }
 
 class packstack::amqp ()