diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index bae4f3b8..1e21892b 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -18,6 +18,8 @@ services:
     environment:
       DB_HOST: db
       HOST: "0.0.0.0"
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
 
     depends_on:
       - db
diff --git a/config/database.yml b/config/database.yml
index 79cef70b..c718f1f7 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -19,8 +19,8 @@ default: &default
   # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   host: <%= ENV.fetch("DB_HOST") { "127.0.0.1" } %>
-  password: postgres
-  user: postgres
+  password: <%= ENV.fetch("POSTGRES_PASSWORD") { nil } %>
+  user: <%= ENV.fetch("POSTGRES_USER") { nil } %>
 
 development:
   <<: *default