diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index ce118be851..aa8ea4181d 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -268,6 +268,13 @@ outputs:
                 fi
               become: true
               when: {get_param: UndercloudUpgrade}
+            # https://bugs.launchpad.net/tripleo/+bug/1776570
+            - name: Manage mysql user for healthcheck and revoke grant
+              shell: |
+                mysql -e "CREATE USER IF NOT EXISTS \`mysql\`@\`localhost\`;"
+                mysql -e "REVOKE ALL PRIVILEGES, GRANT OPTION FROM \`mysql\`@\`localhost\`;"
+              become: true
+              when: {get_param: UndercloudUpgrade}
             - name: Stop and disable mysql service
               when: mariadb_enabled|bool
               service: name=mariadb state=stopped enabled=no