diff --git a/aggregation-app/build.gradle b/aggregation-app/build.gradle
index fd826328..daaddecd 100644
--- a/aggregation-app/build.gradle
+++ b/aggregation-app/build.gradle
@@ -4,18 +4,16 @@ plugins {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'org.springframework.boot:spring-boot-configuration-processor'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-batch'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     implementation(libs.yaci.store.starter)
     implementation(libs.yaci.store.utxo.starter)
     implementation(libs.yaci.store.account.starter)
+    implementation(libs.yaci.store.admin.starter)
 
     implementation project(':components:healthcheck')
-    implementation project(':aggregates:account')
     runtimeOnly 'org.postgresql:postgresql'
 
     compileOnly(libs.lombok)
diff --git a/aggregation-app/src/main/resources/application.yml b/aggregation-app/src/main/resources/application.yml
index 9d313395..5e27eb15 100644
--- a/aggregation-app/src/main/resources/application.yml
+++ b/aggregation-app/src/main/resources/application.yml
@@ -11,7 +11,7 @@ spring:
     out-of-order: true
   datasource:
     hikari:
-      maximum-pool-size: 30
+      maximum-pool-size: 50
       minimum-idle: 5
   jpa:
     properties:
@@ -39,13 +39,17 @@ store:
     history-cleanup-enabled: false
     # 3 months
     balance-cleanup-slot-count: 7889238
-    address-tx-amount-include-zero-amount: true
     api-enabled: true
     parallel-write: true
     write-thread-default-batch-size: 1000
     jooq-write-batch-size: 3000
     write-thread-count: 5
+    save-address-tx-amount: true
+    address-tx-amount-include-zero-amount: true
+  utxo:
+    save-address: true
     address-cache-enabled: true
+    address-cache-size: 100000
   executor:
     enable-parallel-processing: true
     block-processing-threads: 15
@@ -54,6 +58,8 @@ store:
     blocks-partition-size: 10
     use-virtual-thread-for-batch-processing: false
     use-virtual-thread-for-event-processing: true
+  admin:
+    api-enabled: true
 
 ledger-sync:
   healthcheck:
diff --git a/config/application.properties b/config/application.properties
index 4d53d6e0..14ac2e7c 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -22,6 +22,16 @@ store.cardano.protocol-magic=1
 NETWORK=preprod
 
 ##################### Postgres DB #######################
-spring.datasource.url=jdbc:postgresql://localhost:5432/ledger_sync?currentSchema=cexplorer
+spring.datasource.url=jdbc:postgresql://localhost:5432/ledger_sync?currentSchema=ledger_sync
 spring.datasource.username=postgres
 spring.datasource.password=1
+
+
+################## Aggregation App Specific Properties ###########
+#store.account.initial-balance-snapshot-block=1950000
+
+#store.account.balance-calc-job-batch-size=500
+#store.account.balance-calc-job-partition-size=5
+
+#store.admin.health-check-interval=60
+#store.admin.auto-recovery-enabled=true
diff --git a/docker/aggr-app-compose.yml b/docker/aggr-app-compose.yml
new file mode 100644
index 00000000..fb555b00
--- /dev/null
+++ b/docker/aggr-app-compose.yml
@@ -0,0 +1,37 @@
+version: '3.9'
+
+services:
+  ledger-sync-aggregation:
+    image: cardanofoundation/ledger-sync-aggregation:dev
+    container_name: ledger-sync-aggregation-${NETWORK:-mainnet}
+    #    build:
+    #      context: .
+    #      dockerfile: Dockerfile
+    #      target: aggregation
+    environment:
+      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=aggregation}
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
+      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
+      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
+      - STORE_CARDANO_PROTOCOLMAGIC=${STORE_CARDANO_PROTOCOLMAGIC:-764824073}
+      - NETWORK=${NETWORK:-mainnet}
+      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
+      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
+      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
+      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
+      - STORE_ACCOUNT_INITIALBALANCESNAPSHOTBLOCK=${STORE_ACCOUNT_INITIALBALANCESNAPSHOTBLOCK:-0}
+      - STORE_ACCOUNT_BALANCECALCJOBBATCHSIZE=${STORE_ACCOUNT_BALANCECALCJOBBATCHSIZE:-500}
+      - STORE_ACCOUNT_BALANCECALCJOBPARTITIONSIZE=${STORE_ACCOUNT_BALANCECALCJOBPARTITIONSIZE:-5}
+      - STORE_ADMIN_HEALTHCHECKINTERVAL=${STORE_ADMIN_HEALTHCHECKINTERVAL:-120}
+      - STORE_ADMIN_AUTORECOVERYENABLED=${STORE_ADMIN_AUTORECOVERYENABLED:-true}
+    ports:
+      - ${PORT:-8081}:8080
+    volumes:
+      - $PWD/logs:/app/logs
+
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "50"
diff --git a/docker/docker-compose-aggr-and-main.yml b/docker/docker-compose-aggr-and-main.yml
deleted file mode 100644
index 2d84b54b..00000000
--- a/docker/docker-compose-aggr-and-main.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-version: '3.9'
-
-networks:
-  ledger-sync-net:
-
-services:
-  ledger-sync-postgres:
-    image: postgres:14.5
-    shm_size: 16gb
-    environment:
-      - POSTGRES_USER=cardano-master
-      - POSTGRES_PASSWORD=dbpass
-      - POSTGRES_DB=ledger_sync
-      - POSTGRES_LOGGING=true
-    ports:
-      - "54333:5432"
-    volumes:
-      - $PWD/db-data/ledger-sync-postgres/:/var/lib/postgresql/data
-    command: >
-      postgres
-        -c max_connections=500
-        -c max_locks_per_transaction=256
-        -c shared_buffers=12GB
-        -c effective_cache_size=20GB
-        -c maintenance_work_mem=4GB
-        -c checkpoint_completion_target=0.9
-        -c checkpoint_timeout=1h
-        -c synchronous_commit=off
-        -c wal_buffers=16MB
-        -c default_statistics_target=500
-        -c random_page_cost=1.1
-        -c effective_io_concurrency=500
-        -c work_mem=64GB
-        -c min_wal_size=1GB
-        -c max_wal_size=2GB
-        -c max_parallel_workers_per_gather=4
-        -c max_parallel_maintenance_workers=4
-    restart: always
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "100"
-    networks:
-      - ledger-sync-net
-
-  ledger-sync:
-    image: cardanofoundation/ledger-sync:dev
-    container_name: ledger-sync-${NETWORK:-mainnet}
-    #    build:
-    #      context: .
-    #      dockerfile: Dockerfile
-    #      target: ledger-sync
-    environment:
-      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=cexplorer}
-      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
-      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
-      - SCHEMA=${SCHEMA:-cexplorer}
-      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
-      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
-      - STORE_CARDANO_PROTOCOL_MAGIC=${STORE_CARDANO_PROTOCOL_MAGIC:-764824073}
-      - NETWORK=${NETWORK:-mainnet}
-      - BLOCKS_BATCH_SIZE=${BLOCKS_BATCH_SIZE:-100}
-      - COMMIT_THRESHOLD=${COMMIT_THRESHOLD:-3000}
-      - MAXIMUM_POOL_SIZE=${MAXIMUM_POOL_SIZE:-48}
-      - STORE_CARDANO_KEEP_ALIVE_INTERVAL=${STORE_CARDANO_KEEP_ALIVE_INTERVAL:-3000}
-      - SCHEDULER_ENABLED=${SCHEDULER_ENABLED:-true}
-      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
-      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
-      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
-      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
-    ports:
-      - ${LEDGER_SYNC_MAIN_PORT:-8080}:8080
-    volumes:
-      - $PWD/ledger-sync-logs:/app/logs/
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1m"
-        max-file: "50"
-
-    networks:
-      - ledger-sync-net
-  ledger-sync-aggregation:
-    image: cardanofoundation/ledger-sync-aggregation:dev
-    container_name: ledger-sync-aggregation-${NETWORK:-mainnet}
-    #    build:
-    #      context: .
-    #      dockerfile: Dockerfile
-    #      target: aggregation
-    environment:
-      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=aggregation}
-      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
-      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
-      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
-      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
-      - STORE_CARDANO_PROTOCOL_MAGIC=${STORE_CARDANO_PROTOCOL_MAGIC:-764824073}
-      - NETWORK=${NETWORK:-mainnet}
-      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
-      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
-      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
-      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
-    ports:
-      - ${LEDGER_SYNC_AGGREGATION_PORT:-8081}:8080
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1m"
-        max-file: "50"
-
-    networks:
-      - ledger-sync-net
\ No newline at end of file
diff --git a/docker/docker-compose-aggr.yml b/docker/docker-compose-aggr.yml
deleted file mode 100644
index 6ade1c02..00000000
--- a/docker/docker-compose-aggr.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-version: '3.9'
-
-networks:
-  ledger-sync-net:
-
-services:
-  ledger-sync-postgres:
-    image: postgres:14.5
-    shm_size: 16gb
-    environment:
-      - POSTGRES_USER=cardano-master
-      - POSTGRES_PASSWORD=dbpass
-      - POSTGRES_DB=ledger_sync
-      - POSTGRES_LOGGING=true
-    ports:
-      - "54333:5432"
-    volumes:
-      - $PWD/db-data/ledger-sync-postgres/:/var/lib/postgresql/data
-    command: >
-      postgres
-        -c max_connections=500
-        -c max_locks_per_transaction=256
-        -c shared_buffers=12GB
-        -c effective_cache_size=20GB
-        -c maintenance_work_mem=4GB
-        -c checkpoint_completion_target=0.9
-        -c checkpoint_timeout=1h
-        -c synchronous_commit=off
-        -c wal_buffers=16MB
-        -c default_statistics_target=500
-        -c random_page_cost=1.1
-        -c effective_io_concurrency=500
-        -c work_mem=64GB
-        -c min_wal_size=1GB
-        -c max_wal_size=2GB
-        -c max_parallel_workers_per_gather=4
-        -c max_parallel_maintenance_workers=4
-    restart: always
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "100"
-    networks:
-      - ledger-sync-net
-
-  ledger-sync-aggregation:
-    image: cardanofoundation/ledger-sync-aggregation:dev
-    container_name: ledger-sync-aggregation-${NETWORK:-mainnet}
-    #    build:
-    #      context: .
-    #      dockerfile: Dockerfile
-    #      target: aggregation
-    environment:
-      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=aggregation}
-      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
-      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
-      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
-      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
-      - STORE_CARDANO_PROTOCOL_MAGIC=${STORE_CARDANO_PROTOCOL_MAGIC:-764824073}
-      - NETWORK=${NETWORK:-mainnet}
-      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
-      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
-      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
-      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
-    ports:
-      - ${PORT:-8081}:8080
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1m"
-        max-file: "50"
-
-    networks:
-      - ledger-sync-net
diff --git a/docker/docker-compose-full.yml b/docker/docker-compose-full.yml
new file mode 100644
index 00000000..ea21d93b
--- /dev/null
+++ b/docker/docker-compose-full.yml
@@ -0,0 +1,32 @@
+version: '3.9'
+
+networks:
+  ledger-sync-net:
+
+services:
+  ledger-sync-postgres:
+    extends:
+      file: postgres-compose.yml
+      service: ledger-sync-postgres
+    networks:
+      - ledger-sync-net
+
+  ledger-sync:
+    extends:
+      file: main-app-compose.yml
+      service: ledger-sync
+    depends_on:
+      ledger-sync-postgres:
+        condition: service_healthy
+    networks:
+      - ledger-sync-net
+
+  ledger-sync-aggregation:
+    extends:
+      file: aggr-app-compose.yml
+      service: ledger-sync-aggregation
+    depends_on:
+      ledger-sync-postgres:
+        condition: service_healthy
+    networks:
+      - ledger-sync-net
diff --git a/docker/docker-compose-monolith-aggr.yml b/docker/docker-compose-monolith-aggr.yml
new file mode 100644
index 00000000..0808fbec
--- /dev/null
+++ b/docker/docker-compose-monolith-aggr.yml
@@ -0,0 +1,22 @@
+version: '3.9'
+
+networks:
+  ledger-sync-net:
+
+services:
+  ledger-sync-postgres:
+    extends:
+      file: postgres-compose.yml
+      service: ledger-sync-postgres
+    networks:
+      - ledger-sync-net
+
+  ledger-sync-aggregation:
+    extends:
+      file: aggr-app-compose.yml
+      service: ledger-sync-aggregation
+    depends_on:
+      ledger-sync-postgres:
+        condition: service_healthy
+    networks:
+      - ledger-sync-net
diff --git a/docker/docker-compose-monolith-main.yml b/docker/docker-compose-monolith-main.yml
new file mode 100644
index 00000000..614c0a45
--- /dev/null
+++ b/docker/docker-compose-monolith-main.yml
@@ -0,0 +1,22 @@
+version: '3.9'
+
+networks:
+  ledger-sync-net:
+
+services:
+  ledger-sync-postgres:
+    extends:
+      file: postgres-compose.yml
+      service: ledger-sync-postgres
+    networks:
+      - ledger-sync-net
+
+  ledger-sync:
+    extends:
+      file: main-app-compose.yml
+      service: ledger-sync
+    depends_on:
+      ledger-sync-postgres:
+        condition: service_healthy
+    networks:
+      - ledger-sync-net
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 298de528..00000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-version: '3.9'
-
-networks:
-  ledger-sync-net:
-
-services:
-  ledger-sync-postgres:
-    image: postgres:14.5
-    shm_size: 16gb
-    environment:
-      - POSTGRES_USER=cardano-master
-      - POSTGRES_PASSWORD=dbpass
-      - POSTGRES_DB=ledger_sync
-      - POSTGRES_LOGGING=true
-    ports:
-      - "54333:5432"
-    volumes:
-      - $PWD/db-data/ledger-sync-postgres/:/var/lib/postgresql/data
-    command: >
-      postgres
-        -c max_connections=500
-        -c max_locks_per_transaction=256
-        -c shared_buffers=12GB
-        -c effective_cache_size=20GB
-        -c maintenance_work_mem=4GB
-        -c checkpoint_completion_target=0.9
-        -c checkpoint_timeout=1h
-        -c synchronous_commit=off
-        -c wal_buffers=16MB
-        -c default_statistics_target=500
-        -c random_page_cost=1.1
-        -c effective_io_concurrency=500
-        -c work_mem=64GB
-        -c min_wal_size=1GB
-        -c max_wal_size=2GB
-        -c max_parallel_workers_per_gather=4
-        -c max_parallel_maintenance_workers=4
-    restart: always
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "100"
-    networks:
-      - ledger-sync-net
-
-  ledger-sync:
-    image: cardanofoundation/ledger-sync:dev
-    container_name: ledger-sync-${NETWORK:-mainnet}
-    #    build:
-    #      context: .
-    #      dockerfile: Dockerfile
-    #      target: ledger-sync
-    environment:
-      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=cexplorer}
-      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
-      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
-      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
-      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
-      - STORE_CARDANO_PROTOCOL_MAGIC=${STORE_CARDANO_PROTOCOL_MAGIC:-764824073}
-      - NETWORK=${NETWORK:-mainnet}
-      - BLOCKS_BATCH_SIZE=${BLOCKS_BATCH_SIZE:-100}
-      - COMMIT_THRESHOLD=${COMMIT_THRESHOLD:-3000}
-      - MAXIMUM_POOL_SIZE=${MAXIMUM_POOL_SIZE:-48}
-      - STORE_CARDANO_KEEP_ALIVE_INTERVAL=${STORE_CARDANO_KEEP_ALIVE_INTERVAL:-3000}
-      - SCHEDULER_ENABLED=${SCHEDULER_ENABLED:-true}
-      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
-      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
-      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
-      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
-    ports:
-      - ${PORT:-8080}:8080
-    volumes:
-      - $PWD/ledger-sync-logs:/app/logs/
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "1m"
-        max-file: "50"
-
-    networks:
-      - ledger-sync-net
diff --git a/docker/main-app-compose.yml b/docker/main-app-compose.yml
new file mode 100644
index 00000000..f41c6a58
--- /dev/null
+++ b/docker/main-app-compose.yml
@@ -0,0 +1,38 @@
+version: '3.9'
+
+services:
+  ledger-sync:
+    image: cardanofoundation/ledger-sync:dev
+    container_name: ledger-sync-${NETWORK:-mainnet}
+    #    build:
+    #      context: .
+    #      dockerfile: Dockerfile
+    #      target: ledger-sync
+    environment:
+      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://ledger-sync-postgres:5432/ledger_sync?currentSchema=ledger_sync}
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-cardano-master}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-dbpass}
+      - STORE_CARDANO_HOST=${STORE_CARDANO_HOST:-relays-new.cardano-mainnet.iohk.io}
+      - STORE_CARDANO_PORT=${STORE_CARDANO_PORT:-3001}
+      - STORE_CARDANO_PROTOCOLMAGIC=${STORE_CARDANO_PROTOCOLMAGIC:-764824073}
+      - NETWORK=${NETWORK:-mainnet}
+      - BLOCKS_BATCH_SIZE=${BLOCKS_BATCH_SIZE:-100}
+      - COMMIT_THRESHOLD=${COMMIT_THRESHOLD:-3000}
+      - MAXIMUM_POOL_SIZE=${MAXIMUM_POOL_SIZE:-48}
+      - STORE_CARDANO_KEEP_ALIVE_INTERVAL=${STORE_CARDANO_KEEP_ALIVE_INTERVAL:-3000}
+      - SCHEDULER_ENABLED=${SCHEDULER_ENABLED:-true}
+      - HEALTH_CHECK_ENABLED=${HEALTH_CHECK_ENABLED:-true}
+      - EVENT_TIME_THRESHOLD_IN_SECOND=${EVENT_TIME_THRESHOLD_IN_SECOND:-600}
+      - BLOCK_TIME_CHECK_ENABLED=${BLOCK_TIME_CHECK_ENABLED:-true}
+      - BLOCK_TIME_THRESHOLD_IN_SECOND=${BLOCK_TIME_THRESHOLD_IN_SECOND:-180}
+    ports:
+      - ${LEDGER_SYNC_MAIN_PORT:-8080}:8080
+    volumes:
+      - $PWD/logs:/app/logs/
+
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "50"
+
diff --git a/docker/postgres-compose.yml b/docker/postgres-compose.yml
new file mode 100644
index 00000000..c4083e33
--- /dev/null
+++ b/docker/postgres-compose.yml
@@ -0,0 +1,47 @@
+version: '3.9'
+
+services:
+  ledger-sync-postgres:
+    image: postgres:14.5
+    shm_size: 16gb
+    environment:
+      - POSTGRES_USER=cardano-master
+      - POSTGRES_PASSWORD=dbpass
+      - POSTGRES_DB=ledger_sync
+      - POSTGRES_LOGGING=true
+    ports:
+      - "54333:5432"
+    volumes:
+      - $PWD/db-data/ledger-sync-postgres/:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD-SHELL", "sh -c 'pg_isready -U cardano-master -d ledger_sync'" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    command: >
+      postgres
+        -c max_connections=500
+        -c max_locks_per_transaction=256
+        -c shared_buffers=12GB
+        -c effective_cache_size=20GB
+        -c maintenance_work_mem=4GB
+        -c checkpoint_completion_target=0.9
+        -c checkpoint_timeout=1h
+        -c wal_buffers=16MB
+        -c default_statistics_target=500
+        -c random_page_cost=1.1
+        -c effective_io_concurrency=500
+        -c work_mem=64GB
+        -c min_wal_size=1GB
+        -c max_wal_size=2GB
+        -c max_parallel_workers_per_gather=4
+        -c max_parallel_maintenance_workers=4
+        -c wal_level=minimal
+        -c max_wal_senders=0
+        -c synchronous_commit=off
+    restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "100"
diff --git a/docker/psql.sh b/docker/psql.sh
new file mode 100755
index 00000000..2c6babbe
--- /dev/null
+++ b/docker/psql.sh
@@ -0,0 +1 @@
+docker compose -f $1 exec ledger-sync-postgres psql -U cardano-master -d ledger_sync
diff --git a/env.example b/env.example
index e7586f0c..344b49c7 100644
--- a/env.example
+++ b/env.example
@@ -1,6 +1,6 @@
 STORE_CARDANO_HOST=preprod-node.world.dev.cardano.org
 STORE_CARDANO_PORT=30000
-STORE_CARDANO_PROTOCOL-MAGIC=1
+STORE_CARDANO_PROTOCOLMAGIC=1
 
 NETWORK=preprod
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49159907..1e6cf545 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,11 @@
 [libraries]
-yaci-store-starter="com.bloxbean.cardano:yaci-store-spring-boot-starter:0.1.0-rc2-87c7beb-SNAPSHOT"
-yaci-store-utxo-starter="com.bloxbean.cardano:yaci-store-utxo-spring-boot-starter:0.1.0-rc2-87c7beb-SNAPSHOT"
-yaci-store-account-starter="com.bloxbean.cardano:yaci-store-account-spring-boot-starter:0.1.0-rc2-87c7beb-SNAPSHOT"
-yaci-store-remote-starter="com.bloxbean.cardano:yaci-store-remote-spring-boot-starter:0.1.0-rc2-87c7beb-SNAPSHOT"
-yaci-store-governance-starter="com.bloxbean.cardano:yaci-store-governance-spring-boot-starter:0.1.0-rc2-87c7beb-SNAPSHOT"
-yaci-store-events="com.bloxbean.cardano:yaci-store-events:0.1.0-rc2-87c7beb-SNAPSHOT"
+yaci-store-starter="com.bloxbean.cardano:yaci-store-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-utxo-starter="com.bloxbean.cardano:yaci-store-utxo-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-account-starter="com.bloxbean.cardano:yaci-store-account-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-remote-starter="com.bloxbean.cardano:yaci-store-remote-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-governance-starter="com.bloxbean.cardano:yaci-store-governance-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-admin-starter="com.bloxbean.cardano:yaci-store-admin-spring-boot-starter:0.1.0-rc2-f136600-SNAPSHOT"
+yaci-store-events="com.bloxbean.cardano:yaci-store-events:0.1.0-rc2-f136600-SNAPSHOT"
 
 cardano-client-lib="com.bloxbean.cardano:cardano-client-lib:0.5.1"
 snakeyaml="org.yaml:snakeyaml:2.0"