diff --git a/manifests/identity.pp b/manifests/identity.pp
index f6296771..9c4d2b4f 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -399,7 +399,7 @@ class cloud::identity (
     memcache_servers => $memcache_servers,
     sql_connection   => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
     token_driver     => 'keystone.token.backends.memcache.Token',
-    token_format     => 'UUID',
+    token_provider   => 'keystone.token.providers.pki.Provider',
     use_syslog       => true,
     verbose          => $verbose,
     bind_host        => $api_eth,