diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
index d7f2032a1..b0ed9bbec 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -3,6 +3,10 @@ class {"keystone":
     sql_connection => "mysql://keystone_admin:%(CONFIG_KEYSTONE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/keystone",
 }
 
+keystone_config {
+    'signing/token_format':  value => "UUID";
+}
+
 class {"keystone::roles::admin":
     email => "test@test.com",
     password => "%(CONFIG_KEYSTONE_ADMIN_PW)s",