diff --git a/.env.docker.sample b/.env.docker.sample
index 50203ae..2b82918 100644
--- a/.env.docker.sample
+++ b/.env.docker.sample
@@ -1,10 +1,10 @@
 SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
-DB_USER=textsender_auth
-DB_PASSWORD=password
-DB_HOST=auth_db
-DB_PORT=5432
-DB_SSLMODE=disable
-DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}
+DB_AUTH_NAME=textsender_auth_db
+DB_AUTH_USER=textsender_auth
+DB_AUTH_PASSWORD=password
+DB_AUTH_HOST=auth_db
+DB_AUTH_PORT=5432
+DB_AUTH_SSLMODE=disable
+DATABASE_URL=postgres://${DB_AUTH_USER}:${DB_AUTH_PASSWORD}@${DB_AUTH_HOST}:${DB_AUTH_PORT}/${DB_AUTH_NAME}
 ENABLE_REGISTRATION=true
 ALLOWED_ORIGINS="http://textsender.com"
diff --git a/.env.local.sample b/.env.local.sample
index 21ea4da..c76597b 100644
--- a/.env.local.sample
+++ b/.env.local.sample
@@ -1,10 +1,10 @@
 SECRET_KEY=NULqYIzgt28bTiyziCd7IOO7b6LnWDW!
-DB_NAME=textsender_auth_db
-DB_USER=textsender_auth
-DB_PASSWORD=password
-DB_HOST=localhost
-DB_PORT=5432
-DB_SSLMODE=disable
-DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}
+DB_AUTH_NAME=textsender_auth_db
+DB_AUTH_USER=textsender_auth
+DB_AUTH_PASSWORD=password
+DB_AUTH_HOST=localhost
+DB_AUTH_PORT=5432
+DB_AUTH_SSLMODE=disable
+DATABASE_URL=postgres://${DB_AUTH_USER}:${DB_AUTH_PASSWORD}@${DB_AUTH_HOST}:${DB_AUTH_PORT}/${DB_AUTH_NAME}
 ENABLE_REGISTRATION=true
 ALLOWED_ORIGINS="http://textsender.com"