diff --git a/docker-compose.casaos.yml b/docker-compose.casaos.yml
index 4be6d5f..4a96a6c 100644
--- a/docker-compose.casaos.yml
+++ b/docker-compose.casaos.yml
@@ -13,8 +13,8 @@ services:
     environment:
       # Database Configuration
       - DATABASE_PROVIDER=postgresql
-      - DATABASE_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp
-      - DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp_shadow
+      - DATABASE_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp
+      - DATABASE_SHADOW_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp_shadow
       
       # Better Auth Configuration
       # IMPORTANT: Set these via CasaOS environment variables!
@@ -29,7 +29,7 @@ services:
       - TRUSTED_ORIGINS=${TRUSTED_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000}
     
     depends_on:
-      postgres:
+      postgresql:
         condition: service_healthy
     
     volumes:
@@ -41,12 +41,12 @@ services:
     networks:
       - euchre-network
 
-  postgres:
+  postgresql:
     image: postgres:15-alpine
     container_name: euchre-camp-postgres
     environment:
       - POSTGRES_DB=euchre_camp
-      - POSTGRES_USER=euchre
+      - POSTGRES_USER=euchre_camp
       # IMPORTANT: Change this password in production!
       - POSTGRES_PASSWORD=euchrepassword
     ports:
@@ -55,7 +55,7 @@ services:
       - euchre_camp_postgres_data:/var/lib/postgresql/data
       - ./scripts/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U euchre -d euchre_camp"]
+      test: ["CMD-SHELL", "pg_isready -U euchre_camp -d euchre_camp"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index f0fe33c..68a9b92 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -9,8 +9,8 @@ services:
     environment:
       # Database Configuration for Development
       - DATABASE_PROVIDER=postgresql
-      - DATABASE_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp
-      - DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp_shadow
+      - DATABASE_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp
+      - DATABASE_SHADOW_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp_shadow
       
       # Better Auth Configuration
       - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET:-dev-secret-key}
@@ -23,7 +23,7 @@ services:
       - TRUSTED_ORIGINS=${TRUSTED_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000}
     
     depends_on:
-      postgres:
+      postgresql:
         condition: service_healthy
     
     volumes:
@@ -40,12 +40,12 @@ services:
     networks:
       - euchre-network
 
-  postgres:
+  postgresql:
     image: postgres:15-alpine
     container_name: euchre-camp-postgres-dev
     environment:
       - POSTGRES_DB=euchre_camp
-      - POSTGRES_USER=euchre
+      - POSTGRES_USER=euchre_camp
       - POSTGRES_PASSWORD=euchrepassword
     ports:
       - "5433:5432"  # Use different port to avoid conflict with local PostgreSQL
diff --git a/docker-compose.yml b/docker-compose.yml
index f35bef8..e05a055 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ services:
     environment:
       # Database Configuration
       - DATABASE_PROVIDER=postgresql
-      - DATABASE_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp
-      - DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@postgres:5432/euchre_camp_shadow
+      - DATABASE_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp
+      - DATABASE_SHADOW_URL=postgresql://euchre_camp:euchrepassword@postgresql:5432/euchre_camp_shadow
       
       # Better Auth Configuration
       - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET:-your-secret-key-change-in-production}
@@ -23,7 +23,7 @@ services:
       - TRUSTED_ORIGINS=${TRUSTED_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000}
     
     depends_on:
-      postgres:
+      postgresql:
         condition: service_healthy
     
     volumes:
@@ -35,12 +35,12 @@ services:
     networks:
       - euchre-network
 
-  postgres:
+  postgresql:
     image: postgres:15-alpine
     container_name: euchre-camp-postgres
     environment:
       - POSTGRES_DB=euchre_camp
-      - POSTGRES_USER=euchre
+      - POSTGRES_USER=euchre_camp
       - POSTGRES_PASSWORD=euchrepassword
     ports:
       - "5432:5432"
@@ -48,7 +48,7 @@ services:
       - postgres_data:/var/lib/postgresql/data
       - ./scripts/init-postgres.sh:/docker-entrypoint-initdb.d/init-postgres.sh
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U euchre -d euchre_camp"]
+      test: ["CMD-SHELL", "pg_isready -U euchre_camp -d euchre_camp"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/scripts/setup-casaos.sh b/scripts/setup-casaos.sh
index ff9fbf0..22c2444 100755
--- a/scripts/setup-casaos.sh
+++ b/scripts/setup-casaos.sh
@@ -41,8 +41,8 @@ if [ ! -f .env ]; then
 
 # Database Configuration
 DATABASE_PROVIDER=postgresql
-DATABASE_URL=postgresql://euchre:${POSTGRES_PASSWORD}@postgres:5432/euchre_camp
-DATABASE_SHADOW_URL=postgresql://euchre:${POSTGRES_PASSWORD}@postgres:5432/euchre_camp_shadow
+DATABASE_URL=postgresql://euchre_camp:${POSTGRES_PASSWORD}@postgresql:5432/euchre_camp
+DATABASE_SHADOW_URL=postgresql://euchre_camp:${POSTGRES_PASSWORD}@postgresql:5432/euchre_camp_shadow
 
 # Better Auth Configuration
 BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET}