diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index edeab143f..0a80a50ed 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -187,8 +187,8 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
 # Keystone - Identity Options
 #############################
 
-# Valid options are [ uuid, fernet ]
-#keystone_token_provider: 'uuid'
+# Valid options are [ fernet ]
+#keystone_token_provider: 'fernet'
 
 # Interval to rotate fernet keys by (in seconds). Must be an interval of
 # 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min),
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 57af5bc0f..794c5fee5 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -1,8 +1,2 @@
 ---
 # Add extra Kolla global configuration here.
-
-# Although Kolla-Ansible provides full support for Fernet tokens, it still
-# defaults to UUID.  This setting overrides K-A and brings it in-line with
-# Keystone's default.
-#
-keystone_token_provider: 'fernet'