diff --git a/setup.cfg b/setup.cfg
index 268e2765238..b54d492ba88 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -112,7 +112,8 @@ install_requires =
     pinax-notifications @ git+https://github.com/GeoNode/pinax-notifications.git@django_upgrade#egg=pinax-notifications
 
     # GeoNode org maintained apps.
-    django-geonode-mapstore-client>=4.0.5,<5.0.0
+    # django-geonode-mapstore-client==4.0.5
+    django-geonode-mapstore-client @ git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client
     geonode-importer>=1.0.2
     django-avatar==8.0.0
     geonode-oauth-toolkit @ git+https://github.com/GeoNode/geonode-oauth-toolkit.git@openid-connect#egg=geonode-oauth-toolkit
diff --git a/tasks.py b/tasks.py
index a37fe622bad..26f3b44b704 100755
--- a/tasks.py
+++ b/tasks.py
@@ -325,13 +325,6 @@ def migrations(ctx):
         f"python manage.py migrate --noinput --settings={_localsettings()} --database=datastore",
         pty=True,
     )
-    try:
-        ctx.run(
-            f"python manage.py rebuild_index --noinput --settings={_localsettings()}",
-            pty=True,
-        )
-    except Exception:
-        pass
 
 
 @task