diff --git a/.gitignore b/.gitignore
index 625088d..3caa644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ coverage
 # postgres data (local dev)
 .docker/postgres
 .docker/redis
+.env.production
diff --git a/docker-compose.testnet.yml b/docker-compose.testnet.yml
index 2323f93..27d9467 100644
--- a/docker-compose.testnet.yml
+++ b/docker-compose.testnet.yml
@@ -14,9 +14,9 @@ services:
     container_name: sentrix-indexer-testnet-pg
     restart: unless-stopped
     environment:
-      POSTGRES_USER: indexer
-      POSTGRES_PASSWORD: indexer
-      POSTGRES_DB: sentrix_indexer_testnet
+      POSTGRES_USER: ${POSTGRES_USER:?env required}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?env required}
+      POSTGRES_DB: ${POSTGRES_DB:?env required}
     ports:
       - "127.0.0.1:5433:5432"
     volumes:
@@ -38,7 +38,7 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      INDEXER_DATABASE_URL: postgres://indexer:indexer@postgres:5432/sentrix_indexer_testnet
+      INDEXER_DATABASE_URL: ${INDEXER_DATABASE_URL:?env required}
       INDEXER_NETWORK: testnet
       INDEXER_HEALTH_PORT: 8084
       LOG_LEVEL: info
@@ -71,7 +71,7 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      INDEXER_DATABASE_URL: postgres://indexer:indexer@postgres:5432/sentrix_indexer_testnet
+      INDEXER_DATABASE_URL: ${INDEXER_DATABASE_URL:?env required}
       INDEXER_NETWORK: testnet
       API_PORT: 8083
       LOG_LEVEL: info
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f20cd0..ab02f08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,9 +4,9 @@ services:
     container_name: sentrix-indexer-pg
     restart: unless-stopped
     environment:
-      POSTGRES_USER: indexer
-      POSTGRES_PASSWORD: indexer
-      POSTGRES_DB: sentrix_indexer
+      POSTGRES_USER: ${POSTGRES_USER:?env required}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?env required}
+      POSTGRES_DB: ${POSTGRES_DB:?env required}
     ports:
       - "127.0.0.1:5432:5432"
     volumes:
@@ -28,7 +28,7 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      INDEXER_DATABASE_URL: postgres://indexer:indexer@postgres:5432/sentrix_indexer
+      INDEXER_DATABASE_URL: ${INDEXER_DATABASE_URL:?env required}
       INDEXER_NETWORK: ${INDEXER_NETWORK:-mainnet}
       INDEXER_HEALTH_PORT: 8082
       LOG_LEVEL: info
@@ -46,7 +46,7 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      INDEXER_DATABASE_URL: postgres://indexer:indexer@postgres:5432/sentrix_indexer
+      INDEXER_DATABASE_URL: ${INDEXER_DATABASE_URL:?env required}
       INDEXER_NETWORK: ${INDEXER_NETWORK:-mainnet}
       API_PORT: 8081
       LOG_LEVEL: info