diff --git a/compose.yaml b/compose.yaml
index cc0666ad..99739330 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -49,7 +49,7 @@ services:
     environment:
       POSTGRES_USER: "${POSTGRES_USER}"
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
-      # POSTGRES_DB: "${POSTGRES_DB}"
+      POSTGRES_DB: "${POSTGRES_DB:-${POSTGRES_USER}}"
     image: "postgres:17.5-bookworm"
     profiles: ["postgres"]
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
diff --git a/run b/run
index 386758c8..96a070ab 100755
--- a/run
+++ b/run
@@ -122,7 +122,7 @@ psql() {
   # Connect to PostgreSQL
   # shellcheck disable=SC1091
   . .env
-  _dc postgres psql -U "${POSTGRES_USER}" "${@}"
+  _dc postgres psql -d "${POSTGRES_DB:-"${POSTGRES_USER}"}" -U "${POSTGRES_USER}" "${@}"
 }
 
 redis-cli() {