diff --git a/.fixtures.yml b/.fixtures.yml
index 21f4ec4a..4879d94b 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -8,7 +8,7 @@ fixtures:
       ref: 'c9271e02d0d5a317ab390cfce9928601208f6073'
     'keystone':
       repo: 'git://github.com/enovance/puppet-keystone.git'
-      ref: 'e381349c1b838301dd730aa3cd146ecacc75aa7c'
+      ref: '45ac386600c0e79942834da8b69bf09a4809d7bd'
     'nova':
       repo: 'git://github.com/enovance/puppet-nova.git'
       ref: '3ffc5a263113232230b69e621e1b6167f2148390'
diff --git a/Puppetfile b/Puppetfile
index b92aaf84..1e090669 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -37,7 +37,7 @@ mod 'horizon',
   :ref => '16b482ea21a70d8dd06ab4c98ac5a218399b0213'
 mod 'keystone',
   :git => 'git://github.com/enovance/puppet-keystone.git',
-  :ref => 'e381349c1b838301dd730aa3cd146ecacc75aa7c'
+  :ref => '45ac386600c0e79942834da8b69bf09a4809d7bd'
 mod 'neutron',
   :git => 'git://github.com/enovance/puppet-neutron.git',
   :ref => 'cefbdc897d70fd1c1fc44e372f05336674efd940'
diff --git a/manifests/identity.pp b/manifests/identity.pp
index acd7f392..df1bbb7b 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -490,8 +490,8 @@ class cloud::identity (
     admin_port       => $ks_keystone_admin_port,
     token_driver     => $token_driver,
     token_expiration => $ks_token_expiration,
-    admin_endpoint   => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0",
-    public_endpoint  => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/v2.0"
+    admin_endpoint   => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/",
+    public_endpoint  => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/"
   }
 
   keystone_config {
diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb
index 6ed6736e..378f7d1e 100644
--- a/spec/classes/cloud_identity_spec.rb
+++ b/spec/classes/cloud_identity_spec.rb
@@ -135,8 +135,8 @@ describe 'cloud::identity' do
         :token_expiration    => '3600',
         :log_dir             => false,
         :log_file            => false,
-        :admin_endpoint      => 'https://10.0.0.1:35357/v2.0',
-        :public_endpoint     => 'https://10.0.0.1:5000/v2.0'
+        :admin_endpoint      => 'https://10.0.0.1:35357/',
+        :public_endpoint     => 'https://10.0.0.1:5000/'
       )
       is_expected.to contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2')
       is_expected.to contain_keystone_config('DEFAULT/log_file').with_ensure('absent')