diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml
index a941a3e4de..570833d2d3 100644
--- a/ansible/roles/keystone/handlers/main.yml
+++ b/ansible/roles/keystone/handlers/main.yml
@@ -96,4 +96,3 @@
   run_once: True
   when:
     - kolla_action == "upgrade"
-    - inventory_hostname == groups[service.group][-1]
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
index 7a1df217d6..a9260131e2 100644
--- a/ansible/roles/keystone/tasks/upgrade.yml
+++ b/ansible/roles/keystone/tasks/upgrade.yml
@@ -45,5 +45,4 @@
       value: 0
   run_once: True
   when:
-    - inventory_hostname == groups['keystone'][-1]
     - not use_preconfigured_databases | bool
diff --git a/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml
new file mode 100644
index 0000000000..5319b1cd01
--- /dev/null
+++ b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixed `bug #1987982  <https://bugs.launchpad.net/kolla-ansible/+bug/1987982>`_
+    This bug caused the database log_bin_trust_function_creators variable
+    not to be set back to "OFF" after a keystone upgrade.