diff --git a/.env b/.env
index 910ffa2..487d02c 100644
--- a/.env
+++ b/.env
@@ -11,4 +11,8 @@ DB_METABASE_USER=metabase
 DB_METABASE_PASSWORD=metabase
 
 # set "test" to run tests
-SUB_COMMAND=
\ No newline at end of file
+SUB_COMMAND=
+SUB_BATCH_SIZE=100
+SUB_QUERY_LIMIT=25
+SUB_DEBUG=false
+SUB_LOG_LEVEL=info
diff --git a/docker-compose.yml b/docker-compose.yml
index 51bb086..326f542 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,15 +9,15 @@ services:
 
         COPY docker/initialize-db.sh /docker-entrypoint-initdb.d/
     ports:
-      - ${DB_POSTGRES_PORT}:5432
+      - ${DB_POSTGRES_PORT?}:5432
     environment:
-      POSTGRES_USER: ${DB_POSTGRES_USER}
-      POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD}
-      DB_SUBQL_NAME: ${DB_SUBQL_NAME}
+      POSTGRES_USER: ${DB_POSTGRES_USER?}
+      POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD?}
+      DB_SUBQL_NAME: ${DB_SUBQL_NAME?}
     volumes:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_POSTGRES_USER}"]
+      test: ["CMD-SHELL", "pg_isready -U ${DB_POSTGRES_USER?}"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -30,15 +30,19 @@ services:
     restart: always
     environment:
       DB_HOST: postgres
-      DB_PORT: ${DB_POSTGRES_PORT}
-      DB_DATABASE: ${DB_SUBQL_NAME}
-      DB_USER: ${DB_SUBQL_USER}
-      DB_PASS: ${DB_SUBQL_PASSWORD}
+      DB_PORT: ${DB_POSTGRES_PORT?}
+      DB_DATABASE: ${DB_SUBQL_NAME?}
+      DB_USER: ${DB_SUBQL_USER?}
+      DB_PASS: ${DB_SUBQL_PASSWORD?}
     volumes:
       - .:/app
     command:
-      - ${SUB_COMMAND}
+      - ${SUB_COMMAND?}
       - -f=/app
+      - --batch-size=${SUB_BATCH_SIZE?}
+      - --query-limit=${SUB_QUERY_LIMIT?}
+      - --debug=${SUB_DEBUG?}
+      - --log-level=${SUB_LOG_LEVEL?}
       - --db-schema=app
     healthcheck:
       test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"]
@@ -58,10 +62,10 @@ services:
     restart: always
     environment:
       DB_HOST: postgres
-      DB_PORT: ${DB_POSTGRES_PORT}
-      DB_DATABASE: ${DB_POSTGRES_NAME}
-      DB_USER: ${DB_SUBQL_USER}
-      DB_PASS: ${DB_SUBQL_PASSWORD}
+      DB_PORT: ${DB_POSTGRES_PORT?}
+      DB_DATABASE: ${DB_SUBQL_NAME?}
+      DB_USER: ${DB_SUBQL_USER?}
+      DB_PASS: ${DB_SUBQL_PASSWORD?}
     command:
       - --name=app
       - --playground
@@ -76,11 +80,11 @@ services:
     restart: unless-stopped
     environment:
       MB_DB_HOST: postgres
-      MB_DB_PORT: ${DB_POSTGRES_PORT}
-      MB_DB_DBNAME: ${DB_METABASE_NAME}
+      MB_DB_PORT: ${DB_POSTGRES_PORT?}
+      MB_DB_DBNAME: ${DB_METABASE_NAME?}
       MB_DB_TYPE: postgres
-      MB_DB_USER: ${DB_METABASE_USER}
-      MB_DB_PASS: ${DB_METABASE_PASSWORD}
+      MB_DB_USER: ${DB_METABASE_USER?}
+      MB_DB_PASS: ${DB_METABASE_PASSWORD?}
       JAVA_TOOL_OPTIONS: "-Xmx4g"
     ports:
       - 3001:3000