diff --git a/tools/python/maps_generator/generator/steps.py b/tools/python/maps_generator/generator/steps.py
index ac868ce3d..a98f5d089 100644
--- a/tools/python/maps_generator/generator/steps.py
+++ b/tools/python/maps_generator/generator/steps.py
@@ -36,8 +36,11 @@ def multithread_run_if_one_country(func):
     def wrap(env, country, **kwargs):
         if len(env.countries) == 1:
             kwargs.update({"threads_count": settings.THREADS_COUNT})
+        # Otherwise index stage of Taiwan_* mwms continues to run after all other mwms have finished:
         elif country == 'Taiwan_North':
-            kwargs.update({"threads_count": 4})
+            kwargs.update({"threads_count": 6})
+        elif country == 'Taiwan_South':
+            kwargs.update({"threads_count": 2})
         func(env, country, **kwargs)
 
     return wrap