diff --git a/nova/controller.sls b/nova/controller.sls
index 4bd7a9a..fd4df62 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -77,9 +77,6 @@
     {%- if controller.version == "mitaka" or controller.version == "newton" or controller.version == "ocata" %}
     - nova-manage api_db sync
     {%- endif %}
-    {%- if controller.version == "ocata" %}
-    - 'su -s /bin/sh -c "nova-manage cell_v2 map_cell0" nova'
-    {%- endif %}
     {%- if controller.version == "newton" or controller.version == "ocata" %}
     - nova-manage db online_data_migrations
     {%- endif %}
@@ -89,6 +86,12 @@
 
 {%- if controller.version == "ocata" %}
 
+nova_controller_cell_syncdb:
+  cmd.run:
+  - name: 'su -s /bin/sh -c "nova-manage cell_v2 map_cell0" nova'
+  - require:
+    - cmd: nova_controller_syncdb
+
 nova_placement_package:
   pkg.installed:
   - name: nova-placement-api