diff --git a/.gitmodules b/.gitmodules
index a75ddf498..55926483c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
 	url = https://github.com/packstack/puppetlabs-swift.git
 [submodule "packstack/puppet/modules/cinder"]
 	path = packstack/puppet/modules/cinder
-	url = https://github.com/puppetlabs/puppetlabs-cinder.git
+	url = https://github.com/packstack/puppetlabs-cinder.git
 [submodule "packstack/puppet/modules/stdlib"]
 	path = packstack/puppet/modules/stdlib
 	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
diff --git a/packstack/puppet/modules/cinder b/packstack/puppet/modules/cinder
index caf3d14ca..51512cdcc 160000
--- a/packstack/puppet/modules/cinder
+++ b/packstack/puppet/modules/cinder
@@ -1 +1 @@
-Subproject commit caf3d14ca3345a73250977f2e8a7b7f1c2ca4b69
+Subproject commit 51512cdccd22e6a1ad25f28e2527031cda684068