diff --git a/Dockerfile.debug b/Dockerfile.debug
index 1d21291f0..c58220408 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -34,6 +34,8 @@ RUN cargo build
 # final stage
 FROM docker.io/debian:bookworm-slim
 
+RUN apt update && apt install -y curl
+
 WORKDIR /parseable
 
 # Copy the static binary into the final image
diff --git a/docker-compose-distributed-test-with-kafka.yaml b/docker-compose-distributed-test-with-kafka.yaml
index 728c1b77a..6450d1c9d 100644
--- a/docker-compose-distributed-test-with-kafka.yaml
+++ b/docker-compose-distributed-test-with-kafka.yaml
@@ -11,8 +11,10 @@ services:
     volumes:
       - ./parseable-ingest-haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
     depends_on:
-      - parseable-ingest-one
-      - parseable-ingest-two
+      parseable-ingest-one:
+        condition: service_healthy
+      parseable-ingest-two:
+        condition: service_healthy
     networks:
       - parseable-internal
     healthcheck:
@@ -55,7 +57,7 @@ services:
   parseable-query:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.debug
     platform: linux/amd64
     command: [ "parseable", "s3-store" ]
     ports:
@@ -72,6 +74,7 @@ services:
       - P_CHECK_UPDATE=false
       - P_PARQUET_COMPRESSION_ALGO=snappy
       - P_MODE=query
+      - RUST_LOG=warn
     networks:
       - parseable-internal
     healthcheck:
@@ -210,9 +213,12 @@ services:
     networks:
       - parseable-internal
     depends_on:
-      - parseable-query
-      - parseable-ingest-haproxy
-      - minio
+      parseable-query:
+        condition: service_healthy
+      parseable-ingest-haproxy:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
diff --git a/docker-compose-distributed-test.yaml b/docker-compose-distributed-test.yaml
index 4d19856b2..f913665e8 100644
--- a/docker-compose-distributed-test.yaml
+++ b/docker-compose-distributed-test.yaml
@@ -28,7 +28,7 @@ services:
   parseable-query:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.debug
     platform: linux/amd64
     command: [ "parseable", "s3-store" ]
     ports:
@@ -45,6 +45,7 @@ services:
       - P_CHECK_UPDATE=false
       - P_PARQUET_COMPRESSION_ALGO=snappy
       - P_MODE=query
+      - RUST_LOG=warn
     networks:
       - parseable-internal
     healthcheck:
@@ -53,7 +54,8 @@ services:
       timeout: 20s
       retries: 5
     depends_on:
-      - minio
+      minio:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
@@ -63,7 +65,7 @@ services:
   parseable-ingest-one:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.debug
     platform: linux/amd64
     command: [ "parseable", "s3-store", ]
     ports:
@@ -81,6 +83,7 @@ services:
       - P_PARQUET_COMPRESSION_ALGO=snappy
       - P_MODE=ingest
       - P_INGESTOR_ENDPOINT=parseable-ingest-one:8000
+      - RUST_LOG=warn
     networks:
       - parseable-internal
     healthcheck:
@@ -89,8 +92,10 @@ services:
       timeout: 20s
       retries: 5
     depends_on:
-      - parseable-query
-      - minio
+      parseable-query:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
@@ -121,9 +126,12 @@ services:
     networks:
       - parseable-internal
     depends_on:
-      - parseable-query
-      - parseable-ingest-one
-      - minio
+      parseable-query:
+        condition: service_healthy
+      parseable-ingest-one:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
diff --git a/docker-compose-test-with-kafka.yaml b/docker-compose-test-with-kafka.yaml
index 39f3ebc74..0b0010124 100644
--- a/docker-compose-test-with-kafka.yaml
+++ b/docker-compose-test-with-kafka.yaml
@@ -49,8 +49,10 @@ services:
       - P_KAFKA_BOOTSTRAP_SERVERS=kafka-0:9092
       # additional settings like security, tuning, etc.
     depends_on:
-      - minio
-      - kafka-0
+      minio:
+        condition: service_healthy
+      kafka-0:
+        condition: service_healthy
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/liveness" ]
       interval: 15s
@@ -82,7 +84,8 @@ services:
       "parseable"
     ]
     depends_on:
-      - parseable
+      parseable:
+        condition: service_healthy
     networks:
       - parseable-internal
     deploy:
@@ -146,14 +149,15 @@ services:
   kafka-log-generator:
     build:
       context: ./scripts
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.debug
     environment:
       - KAFKA_BROKERS=kafka-0:9092
       - KAFKA_TOPIC=test-logs-stream
       - LOG_RATE=5000
       - TOTAL_LOGS=500_000
     depends_on:
-      - kafka-0
+      kafka-0:
+        condition: service_healthy
     networks:
       - parseable-internal
     deploy:
diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml
index 264a07761..70b2af76a 100644
--- a/docker-compose-test.yaml
+++ b/docker-compose-test.yaml
@@ -27,7 +27,7 @@ services:
   parseable:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.debug
     platform: linux/amd64
     command: [ "parseable", "s3-store", ]
     ports:
@@ -43,8 +43,10 @@ services:
       - P_PASSWORD=parseableadmin
       - P_CHECK_UPDATE=false
       - P_PARQUET_COMPRESSION_ALGO=snappy
+      - RUST_LOG=warn
     depends_on:
-      - minio
+      minio:
+        condition: service_healthy
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/liveness" ]
       interval: 15s
@@ -76,7 +78,8 @@ services:
       "parseable"
     ]
     depends_on:
-      - parseable
+      parseable:
+        condition: service_healthy
     networks:
       - parseable-internal
     deploy: