diff --git a/.gitmodules b/.gitmodules
index 113d16d85..065c1bdc5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/packstack/puppetlabs-horizon.git
 [submodule "packstack/puppet/modules/keystone"]
 	path = packstack/puppet/modules/keystone
-	url = https://github.com/puppetlabs/puppetlabs-keystone.git
+	url = https://github.com/packstack/puppetlabs-keystone.git
 [submodule "packstack/puppet/modules/nova"]
 	path = packstack/puppet/modules/nova
 	url = https://github.com/packstack/puppetlabs-nova.git
diff --git a/packstack/puppet/modules/keystone b/packstack/puppet/modules/keystone
index bad02dd2f..611ba8047 160000
--- a/packstack/puppet/modules/keystone
+++ b/packstack/puppet/modules/keystone
@@ -1 +1 @@
-Subproject commit bad02dd2f62c7bce90ff24fecec92ee4ddae2b64
+Subproject commit 611ba804721ad1aadc6e1428e6b7d4c127d254cb