diff --git a/cleanup.sh b/cleanup.sh
index fcf5193..407f598 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -19,6 +19,7 @@ docker container stop ocean_pdr-trader_1
 docker container stop ocean_pdr-predictoor_1
 docker container stop ocean_pdr-trueval_1
 docker container stop ocean_pdr-publisher_1
+docker container stop ocean_pdr-dfbuyer_1
 docker container rm ocean_aquarius_1
 docker container rm ocean_graph-node_1
 docker container rm ocean_subgraph_1
@@ -39,6 +40,7 @@ docker container rm ocean_pdr-trader_1
 docker container rm ocean_pdr-predictoor_1
 docker container rm ocean_pdr-trueval_1
 docker container rm ocean_pdr-publisher_1
+docker container rm ocean_pdr-dfbuyer_1
 docker volume rm ocean_graphipfs
 docker volume rm ocean_graphpgsql
 docker volume rm ocean_provider1db
diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml
index 9995528..382e69e 100644
--- a/compose-files/ganache.yml
+++ b/compose-files/ganache.yml
@@ -7,4 +7,4 @@ services:
     networks:
       backend:
         ipv4_address: 172.15.0.3
-    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","20000000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
+    entrypoint: ["node","/app/dist/node/cli.js","--database.dbPath", "./ganache_cache","--chain.chainId","0x2324","--chain.networkId","0x2324","-l","50000000","-g","1","--chain.hardfork","${GANACHE_FORK}","--miner.blockTime","${GANACHE_BLOCKTIME}","--miner.instamine","${GANACHE_INSTAMINE}","--wallet.mnemonic","${GANACHE_MNEMONIC}", "-e","1000000"]
diff --git a/compose-files/pdr-dfbuyer.yml b/compose-files/pdr-dfbuyer.yml
index 0946c97..fbc5ffb 100644
--- a/compose-files/pdr-dfbuyer.yml
+++ b/compose-files/pdr-dfbuyer.yml
@@ -1,19 +1,19 @@
 version: '3'
 services:
-  pdr-predictoor:
+  pdr-dfbuyer:
     image: oceanprotocol/pdr-dfbuyer:${PDR_DFBUYER_VERSION:-latest}
     networks:
       backend:
-        ipv4_address: 172.15.0.41
+        ipv4_address: 172.15.0.44
     environment:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0x1f990f8b013fc5c7955e0f8746f11ded231721b9cf3f99ff06cdc03492b28090"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
       WEEKLY_SPEND_LIMIT: 10000
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-predictoor.yml b/compose-files/pdr-predictoor.yml
index edc4aa8..84ef684 100644
--- a/compose-files/pdr-predictoor.yml
+++ b/compose-files/pdr-predictoor.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0xef4b441145c1d0f3b4bc6d61d29f5c6e502359481152f869247c7a4244d45209"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-trader.yml b/compose-files/pdr-trader.yml
index e9415b8..5be6fc1 100644
--- a/compose-files/pdr-trader.yml
+++ b/compose-files/pdr-trader.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0x8467415bb2ba7c91084d932276214b11a3dd9bdb2930fefa194b666dd8020b99"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
diff --git a/compose-files/pdr-trueval.yml b/compose-files/pdr-trueval.yml
index 321b7da..28dabb4 100644
--- a/compose-files/pdr-trueval.yml
+++ b/compose-files/pdr-trueval.yml
@@ -9,10 +9,10 @@ services:
       RPC_URL: ${NETWORK_RPC_URL}
       SUBGRAPH_URL: http://172.15.0.15:8000/subgraphs/name/oceanprotocol/ocean-subgraph
       PRIVATE_KEY: "0xc594c6e5def4bab63ac29eed19a134c130388f74f019bc74b8f4389df2837a58"
-      ADDRESS_FILE: /ocean-contracts/artifacts/address.json
       WAIT_FOR_SUBGRAPH: "true"
+      DELAYED_STARTUP: 120
     depends_on:
       - ganache
     volumes:
     - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
-    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/
\ No newline at end of file
+    - ${OCEAN_SUBGRAPH_FOLDER}:/ocean-subgraph/