diff --git a/_states/novav21.py b/_states/novav21.py
index 7b6452b..bcb5d04 100644
--- a/_states/novav21.py
+++ b/_states/novav21.py
@@ -361,10 +361,13 @@
     return ret
 
 
-def instances_mapped_to_cell(name, timeout=60, runas='nova'):
+def instances_mapped_to_cell(name, max_count=None, timeout=60, runas='nova'):
     """Ensure that all instances in the cell are mapped
 
     :param name: cell name.
+    :param max_count: how many instances to map in one iteration. If there are
+        lots of instances present in the cell database, consider setting higher
+        value. By default nova will run in batches of 50.
     :param timeout: amount of time in seconds mapping process should finish in.
     :param runas: username to run the shell commands under.
     """
@@ -378,12 +381,13 @@
             'Failed to map all instances in cell {0}, it does not exist'
             .format(name))
         return result
+    command = 'nova-manage cell_v2 map_instances --cell_uuid %s' % cell_uuid
+    if max_count:
+        command += ' --max-count %s' % max_count
     start_time = time.time()
     if not test:
         while True:
-            rc = __salt__['cmd.retcode'](
-                'nova-manage cell_v2 map_instances --cell_uuid %s' % cell_uuid,
-                runas=runas)
+            rc = __salt__['cmd.retcode'](command, runas=runas)
             if rc == 0 or time.time() - start_time > timeout:
                 break
         if rc != 0:
diff --git a/nova/controller.sls b/nova/controller.sls
index f905a6b..c7ce2ba 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -443,6 +443,9 @@
 nova_controller_map_instances:
   novav21.instances_mapped_to_cell:
   - name: 'cell1'
+{%- if controller.get('mapped_instances_max_count') %}
+  - max_count: {{ controller.get('mapped_instances_max_count') }}
+{%- endif %}
   - timeout: {{ controller.get('mapped_instances_interval', 60) }}
   {%- if grains.get('noservices') %}
   - onlyif: /bin/false