diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml
index 4a6100fa6e..e749adced4 100644
--- a/ansible/roles/glance/tasks/bootstrap_service.yml
+++ b/ansible/roles/glance/tasks/bootstrap_service.yml
@@ -13,6 +13,8 @@
       value: 1
   run_once: True
   delegate_to: "{{ groups[glance_api.group][0] }}"
+  when:
+    - not use_preconfigured_databases | bool
 
 - name: Running Glance bootstrap container
   vars:
@@ -47,3 +49,5 @@
       value: 0
   run_once: True
   delegate_to: "{{ groups[glance_api.group][0] }}"
+  when:
+    - not use_preconfigured_databases | bool
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
index 3aa85a4595..b20d5792cc 100644
--- a/ansible/roles/keystone/tasks/upgrade.yml
+++ b/ansible/roles/keystone/tasks/upgrade.yml
@@ -12,7 +12,9 @@
       variable: log_bin_trust_function_creators
       value: 1
   run_once: True
-  when: inventory_hostname == groups['keystone'][0]
+  when:
+    - inventory_hostname == groups['keystone'][0]
+    - not use_preconfigured_databases | bool
 
 - name: Init keystone database upgrade
   command: /bin/true
@@ -38,5 +40,6 @@
       variable: log_bin_trust_function_creators
       value: 0
   run_once: True
-  when: inventory_hostname == groups['keystone'][-1]
-
+  when:
+    - inventory_hostname == groups['keystone'][-1]
+    - not use_preconfigured_databases | bool
diff --git a/doc/source/reference/external-mariadb-guide.rst b/doc/source/reference/external-mariadb-guide.rst
index cd812148a8..7d34db6593 100644
--- a/doc/source/reference/external-mariadb-guide.rst
+++ b/doc/source/reference/external-mariadb-guide.rst
@@ -156,6 +156,11 @@ Within ``/etc/kolla/globals.yml``, set the following:
 
 .. end
 
+.. note:: Please note that when the ``use_preconfigured_databases`` flag
+  is set to ``"yes"``, you need to have the ``log_bin_trust_function_creators``
+  mysql variable set to ``1`` by your database administrator before running the
+  ``upgrade`` command.
+
 Using External MariaDB with separated, preconfigured users and databases
 ------------------------------------------------------------------------
 
@@ -208,4 +213,4 @@ all you need to do is the following:
 
   sed -i -r -e 's/([a-z_]{0,}database_password:+)$/\1 mycommonpass/gi' /etc/kolla/passwords.yml
 
-.. end
+.. end
\ No newline at end of file
diff --git a/doc/source/user/operating-kolla.rst b/doc/source/user/operating-kolla.rst
index 6d08b42062..ddbaa7b1b6 100644
--- a/doc/source/user/operating-kolla.rst
+++ b/doc/source/user/operating-kolla.rst
@@ -63,6 +63,10 @@ Then run the command to upgrade::
   does not work at all. This is acceptable because KVM is the recommended
   virtualization driver to use with Nova.
 
+.. note:: Please note that when the ``use_preconfigured_databases`` flag is
+  set to ``"yes"``, you need to have the ``log_bin_trust_function_creators``
+  set to ``1`` by your database administrator before performing the upgrade.
+
 
 Tips and Tricks
 ===============