diff --git a/.env.production b/.env.production
index 1fb80de..14ef57a 100644
--- a/.env.production
+++ b/.env.production
@@ -4,9 +4,9 @@
 # Database configuration
 DB_HOST=calejo-postgres
 DB_PORT=5432
-DB_NAME=calejo_production
-DB_USER=calejo_user
-DB_PASSWORD=production_password
+DB_NAME=calejo
+DB_USER=calejo
+DB_PASSWORD=password
 
 # Disable internal protocol servers
 OPCUA_ENABLED=false
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 9ef7256..d26d7f0 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -32,9 +32,9 @@ services:
     image: postgres:15
     container_name: calejo-postgres
     environment:
-      - POSTGRES_DB=calejo_production
-      - POSTGRES_USER=calejo_user
-      - POSTGRES_PASSWORD=production_password
+      - POSTGRES_DB=calejo
+      - POSTGRES_USER=calejo
+      - POSTGRES_PASSWORD=password
     ports:
       - "5432:5432"
     volumes: