diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c7..a1d6377bfee 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -35,6 +35,5 @@ services:
           tar xvfz /tmp/assetstore.tar.gz
         fi
 
-        /dspace/bin/dspace index-discovery -b
         /dspace/bin/dspace oai import
         /dspace/bin/dspace oai clean-cache
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index a6533dab578..9e025c4bc6b 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -57,6 +57,7 @@ services:
     - |
       while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate force
+      /dspace/bin/dspace dspace index-discovery -b
       catalina.sh run
   # DSpace database container
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data