diff --git a/compose.yml b/compose.yml
index 5033bcf..b445876 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,8 +3,8 @@ services:
     profiles: ["all", "db", "infra"]
     image: ankane/pgvector
     environment:
-      POSTGRES_USER: admin
-      POSTGRES_PASSWORD: admin
+      POSTGRES_USER: ${PGUSER:-postgres}
+      POSTGRES_PASSWORD: ${PGPASSWORD:-changeme}
       POSTGRES_DATA: /data/postgres
     volumes:
        - ./postgres:/data/postgres
@@ -21,7 +21,7 @@ services:
       - "8088:80"
     environment:
       PGADMIN_DEFAULT_EMAIL: "${PGUSER:-postgres}@guardrails.com"
-      PGADMIN_DEFAULT_PASSWORD: admin
+      PGADMIN_DEFAULT_PASSWORD: ${PGPASSWORD:-changeme}
       PGADMIN_SERVER_JSON_FILE: /var/lib/pgadmin/servers.json
     # FIXME: Copy over server.json file and create passfile
     volumes: