diff --git a/.gitmodules b/.gitmodules
index 7784744b6..766470815 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -57,7 +57,7 @@
         url = https://github.com/puppetlabs/puppetlabs-inifile.git
 [submodule "packstack/puppet/modules/qpid"]
 	path = packstack/puppet/modules/qpid
-	url = https://github.com/derekhiggins/puppet-qpid.git
+	url = https://github.com/packstack/puppet-qpid.git
 [submodule "packstack/puppet/modules/vlan"]
 	path = packstack/puppet/modules/vlan
 	url = https://github.com/derekhiggins/puppet-vlan.git
diff --git a/packstack/puppet/modules/qpid b/packstack/puppet/modules/qpid
index 4ada31cbf..8fcc5314d 160000
--- a/packstack/puppet/modules/qpid
+++ b/packstack/puppet/modules/qpid
@@ -1 +1 @@
-Subproject commit 4ada31cbfc99b28dfb5eed449ff609d19a5b90ec
+Subproject commit 8fcc5314d1d0d20e0b3344ab8829713df4a4efa0
diff --git a/packstack/puppet/templates/qpid.pp b/packstack/puppet/templates/qpid.pp
index f7596a556..1dd901ae4 100644
--- a/packstack/puppet/templates/qpid.pp
+++ b/packstack/puppet/templates/qpid.pp
@@ -1,6 +1,7 @@
 
 class {"qpid::server":
-    auth => "no"
+    auth => "no",
+    clustered => false,
 }
 
 firewall { '001 qpid incoming':
@@ -8,4 +9,3 @@ firewall { '001 qpid incoming':
     dport    => ['5672'],
     action   => 'accept',
 }
-