diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 18b88987dc..9cfd4b6293 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -254,3 +254,19 @@ outputs:
         - name: Check and upgrade Mysql database after major version upgrade
           command: docker exec -u root mysql mysql_upgrade
           when: step|int == 2
+      fast_forward_upgrade_tasks:
+        - when:
+            - step|int == 6
+            - release == 'ocata'
+            - is_bootstrap_node|bool
+          block:
+            - name: Create cell0 db
+              mysql_db:
+                name: nova_cell0
+                state: present
+            - name: Grant access to cell0 db
+              mysql_user:
+                name: nova
+                host_all: yes
+                state: present
+                priv: '*.*:ALL'
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 24aa371001..793b7e2278 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -408,18 +408,6 @@ outputs:
             - release == 'ocata'
             - is_bootstrap_node|bool
           block:
-            - name: Create cell0 db
-              mysql_db:
-                name: nova_cell0
-                state: present
-
-            - name: Grant access to cell0 db
-              mysql_user:
-                name: nova
-                host_all: yes
-                state: present
-                priv: '*.*:ALL'
-
             - name: Create puppet manifest to set transport_url in nova.conf
               copy:
                 dest: /root/nova-api_upgrade_manifest.pp
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index dcc38f1730..52f7dbbb9a 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -505,3 +505,19 @@ outputs:
             - name: Upgrade Mysql database from the host
               shell: /bin/bash -ecx "{{mysql_upgrade_script}}"
               when: not mysql_containerized|bool
+      fast_forward_upgrade_tasks:
+        - when:
+            - step|int == 6
+            - release == 'ocata'
+            - is_bootstrap_node|bool
+          block:
+            - name: Create cell0 db
+              mysql_db:
+                name: nova_cell0
+                state: present
+            - name: Grant access to cell0 db
+              mysql_user:
+                name: nova
+                host_all: yes
+                state: present
+                priv: '*.*:ALL'