diff --git a/docker/docker-compose-manual-binaries.yml b/docker/docker-compose-manual-binaries.yml
index ee53bec..c7cf306 100644
--- a/docker/docker-compose-manual-binaries.yml
+++ b/docker/docker-compose-manual-binaries.yml
@@ -41,7 +41,7 @@ services:
 
   bootstrap:
     image: statusteam/nim-waku:v0.20.0
-    restart: on-failure
+    restart: always
     ports:
       - 127.0.0.1:60000:60000
       - 127.0.0.1:8008:8008
@@ -67,6 +67,7 @@ services:
     ports:
       - 0.0.0.0:8546:8546
       - 0.0.0.0:8004:8004
+      - 0.0.0.0:60001:60001
     <<:
       - *logging
     volumes:
@@ -94,6 +95,7 @@ services:
     ports:
       - 0.0.0.0:8545:8545
       - 0.0.0.0:8003:8003
+      - 0.0.0.0:60002:60002
     <<:
       - *logging
       - *pg_env
@@ -134,7 +136,7 @@ services:
       - bootstrap
     deploy:
       mode: replicated
-      replicas: 10
+      replicas: 2
       resources:
         limits:
           cpus: '1'
@@ -153,7 +155,9 @@ services:
       driver: none
     deploy:
       mode: replicated
-      replicas: 10
+        #replicas: 0 - with this, normal behaviour
+        #replicas: 25 - it worked pretty well
+      replicas: 50
     command:
       - /opt/run_database_hammer.sh
     depends_on:
@@ -170,7 +174,7 @@ services:
       - ./run_waku_store_query_maker.sh:/opt/run_waku_store_query_maker.sh:Z
     environment:
       STORE_QUERIES_PER_SECOND: 1
-      NUM_CONCURRENT_USERS: 1
+      NUM_CONCURRENT_USERS: 25
     depends_on:
       - nwaku-postgres
       - nwaku-sqlite
diff --git a/docker/run_bootstrap.sh b/docker/run_bootstrap.sh
index fab8d40..c82a3d3 100755
--- a/docker/run_bootstrap.sh
+++ b/docker/run_bootstrap.sh
@@ -20,10 +20,10 @@ exec /usr/bin/wakunode\
       --dns-discovery=true\
       --discv5-discovery=true\
       --discv5-enr-auto-update=True\
-      --log-level=INFO\
+      --log-level=DEBUG\
       --rpc-port=8544\
       --rpc-address=0.0.0.0\
       --metrics-server=True\
       --metrics-server-address=0.0.0.0\
       --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68\
-      --nat=extip:${IP}
\ No newline at end of file
+      --nat=extip:${IP}
diff --git a/docker/run_database_hammer.sh b/docker/run_database_hammer.sh
index acfb8b0..b1dfe0a 100644
--- a/docker/run_database_hammer.sh
+++ b/docker/run_database_hammer.sh
@@ -18,5 +18,5 @@ do
   echo "Before making query"
   psql -h postgres -p 5432 -U postgres -U postgres -w -c "${QUERY_LAST_FIVE_MINUTES}"
 
-  #sleep 0.01
+  sleep 0.01
 done
diff --git a/docker/run_nwaku_store_postgres_ubuntu.sh b/docker/run_nwaku_store_postgres_ubuntu.sh
index 4e86ea6..d65475d 100644
--- a/docker/run_nwaku_store_postgres_ubuntu.sh
+++ b/docker/run_nwaku_store_postgres_ubuntu.sh
@@ -8,7 +8,6 @@ apt-get install wget -y
 bootstrap_IP=$(dig +short bootstrap)
 
 apt-get install libpq5 -y
-chmod +x /usr/bin/wakunode
 
 RETRIES=${RETRIES:=10}
 
@@ -28,6 +27,7 @@ IP=$(hostname -I)
 
 echo "I am postgres ubuntu. Listening on: ${IP}"
 
+  ##--store-max-num-db-connections=50\
 ./usr/bin/wakunode\
   --relay=true\
   --topic=/waku/2/default-waku/proto\
@@ -36,6 +36,7 @@ echo "I am postgres ubuntu. Listening on: ${IP}"
   --keep-alive=true\
   --log-level=DEBUG\
   --rpc-port=8545\
+  --tcp-port=60002\
   --rpc-address=0.0.0.0\
   --metrics-server=True\
   --metrics-server-port=8003\
diff --git a/docker/run_nwaku_store_sqlite_ubuntu.sh b/docker/run_nwaku_store_sqlite_ubuntu.sh
index c4108d6..364ea46 100644
--- a/docker/run_nwaku_store_sqlite_ubuntu.sh
+++ b/docker/run_nwaku_store_sqlite_ubuntu.sh
@@ -8,7 +8,6 @@ apt-get install wget -y
 bootstrap_IP=$(dig +short bootstrap)
 
 apt-get install libpq5 -y
-chmod +x /usr/bin/wakunode
 
 RETRIES=${RETRIES:=10}
 
@@ -36,6 +35,7 @@ echo "I am sqlite ubuntu. Listening on: ${IP}"
   --keep-alive=true\
   --log-level=DEBUG\
   --rpc-port=8546\
+  --tcp-port=60001\
   --rpc-address=0.0.0.0\
   --metrics-server=True\
   --metrics-server-port=8004\