diff --git a/docker-compose.yml b/docker-compose.yml
index a366c321..066dbfc0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       kafka:
         condition: service_started
       objstore:
-        condition: service_started
+        condition: service_healthy
     healthcheck:
       test: wget -q http://localhost:3001/health -O /dev/null || exit 1
       timeout: 20s
@@ -240,6 +240,8 @@ services:
         condition: service_started
       central-ledger:
         condition: service_started
+      simulator:
+        condition: service_healthy
     volumes:
       - ./docker/wait4:/opt/app/wait4
       - ./docker/config-modifier:/opt/app/config-modifier
diff --git a/docker/ml-testing-toolkit/test-cases/collections/tests/p2p.json b/docker/ml-testing-toolkit/test-cases/collections/tests/p2p.json
index 25b2ccbd..96495f59 100644
--- a/docker/ml-testing-toolkit/test-cases/collections/tests/p2p.json
+++ b/docker/ml-testing-toolkit/test-cases/collections/tests/p2p.json
@@ -44,8 +44,7 @@
             "fspId": "{$inputs.toFspId}",
             "currency": "{$inputs.currency}"
           },
-          "url": "{$inputs.HOST_ACCOUNT_LOOKUP_SERVICE}",
-          "ignoreCallbacks": true
+          "url": "{$inputs.HOST_ACCOUNT_LOOKUP_SERVICE}"
         },
         {
           "id": 3,
@@ -433,4 +432,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/docker/wait4/wait4.config.js b/docker/wait4/wait4.config.js
index e2b50d9e..8fd8f45c 100644
--- a/docker/wait4/wait4.config.js
+++ b/docker/wait4/wait4.config.js
@@ -32,12 +32,12 @@ module.exports = {
             configPath: '../config/default.json'
           },
           retries: 60
-        },
-        {
-          description: 'MongoDB object store',
-          uri: 'mongodb://objstore:27017/mlos',
-          method: 'mongo'
         }
+        // {
+        //   description: 'MongoDB object store',
+        //   uri: 'mongodb://objstore:27017/mlos',
+        //   method: 'mongo'
+        // }
       ]
     },
     {