diff --git a/Resources/compose/docker-compose-prod-graphql.yml b/Resources/compose/docker-compose-prod-graphql.yml
index fcdf1bca..d50c8e58 100644
--- a/Resources/compose/docker-compose-prod-graphql.yml
+++ b/Resources/compose/docker-compose-prod-graphql.yml
@@ -14,7 +14,7 @@ services:
 
   graphql-engine:
     environment:
-      HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/pokeapi"
+      HASURA_GRAPHQL_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-pokeapi}"
       HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}"
 
   graphiql:
diff --git a/config/docker-compose.py b/config/docker-compose.py
index f8dffe4c..185878ce 100644
--- a/config/docker-compose.py
+++ b/config/docker-compose.py
@@ -5,7 +5,7 @@ from .settings import *
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "pokeapi",
+        "NAME": os.environ.get("POSTGRES_DB", "pokeapi"),
         "USER": os.environ.get("POSTGRES_USER", "ash"),
         "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "pokemon"),
         "HOST": "db",
diff --git a/docker-compose.yml b/docker-compose.yml
index 28a2dfff..f2d5814a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,9 +9,9 @@ services:
   db:
     image: postgres
     environment:
-      POSTGRES_PASSWORD: 'pokemon'
-      POSTGRES_USER: 'ash'
-      POSTGRES_DB: 'pokeapi'
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
+      POSTGRES_USER: ${POSTGRES_USER:-ash}
+      POSTGRES_DB: ${POSTGRES_DB:-pokeapi}
     volumes:
       - pg_data:/var/lib/postgresql/data
     restart: always
@@ -20,6 +20,10 @@ services:
     build:
       context: .
       dockerfile: ./Resources/docker/app/Dockerfile
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
+      POSTGRES_USER: ${POSTGRES_USER:-ash}
+      POSTGRES_DB: ${POSTGRES_DB:-pokeapi}
     volumes:
       - .:/code
     links:
@@ -53,11 +57,11 @@ services:
       - "db"
     restart: always
     environment:
-      HASURA_GRAPHQL_DATABASE_URL: postgres://ash:pokemon@db:5432/pokeapi
+      HASURA_GRAPHQL_DATABASE_URL: postgres://${POSTGRES_USER:-ash}:${POSTGRES_PASSWORD:-pokemon}@db:5432/${POSTGRES_DB:-pokeapi}
       HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
       HASURA_GRAPHQL_DEV_MODE: "false"
       HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
-      HASURA_GRAPHQL_ADMIN_SECRET: pokemon
+      HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-pokemon}
       HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anon
       HASURA_GRAPHQL_ENABLE_TELEMETRY: "false"
       # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets